Merge branch 'master' into dev · akromm-zz/azure-powershell@fa8cb8d · GitHub

Commit

Merge branch 'master' into dev

Browse files

Conflicts:
	src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config

Loading branch information

ogail authored and ogail committed Nov 22, 2014

2 parents 6497655 + 270237e commit fa8cb8d