Merge pull request #6961 from dotnet-bot/from-tfs
authorBruce Forstall <brucefo@microsoft.com>
Mon, 29 Aug 2016 20:34:51 +0000 (13:34 -0700)
committerGitHub <noreply@github.com>
Mon, 29 Aug 2016 20:34:51 +0000 (13:34 -0700)
Merge changes from TFS

1  2 
src/mscorlib/src/System/Text/Encoding.cs