Merge branch 'master' into dev/api
authorWes Haggard <Wes.Haggard@microsoft.com>
Wed, 22 Jun 2016 18:41:11 +0000 (11:41 -0700)
committerWes Haggard <Wes.Haggard@microsoft.com>
Wed, 22 Jun 2016 18:41:11 +0000 (11:41 -0700)
commite93187eba5d1e7557da4d73f8223349523888762
tree9ad9db00ad27362f5a5184385f3134c2e03501bb
parent0c4f6026d149544c58018585242d0bc770a0bfce
parent094c7723e0cfb186c4080b9daf1bba6eb4b3bbff
Merge branch 'master' into dev/api

Merge conflicts:
src/System.IO/ref/System.IO.csproj
src/System.IO/src/System.IO.csproj
src/System.IO/tests/System.IO.Tests.csproj
src/System.IO/tests/project.json

Commit migrated from https://github.com/dotnet/corefx/commit/11eb1de5f8f2b11066e0d6caedbf40c642d17472
src/libraries/System.IO/ref/System.IO.csproj
src/libraries/System.IO/src/System.IO.csproj
src/libraries/System.IO/src/project.json
src/libraries/System.IO/tests/System.IO.Tests.csproj
src/libraries/System.IO/tests/project.json