Merge branch 'dev' of https://github.com/gcheng/azure-sdk-for-java-pr… · jianghaolu/azure-sdk-for-java@a0f9807 · GitHub

Commit

Merge branch 'dev' of https://github.com/gcheng/azure-sdk-for-java-pr …

Browse files

…into dev

Conflicts:
	microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/MediaContract.java
	microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaExceptionProcessor.java
	microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/implementation/MediaRestProxy.java

Loading branch information

Albert Cheng committed Nov 13, 2012

2 parents af3088a + 90adf54 commit a0f9807