Merge pull request #2169 from dotnet-bot/from-tfs
authorAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>
Thu, 26 Nov 2015 00:34:31 +0000 (16:34 -0800)
committerAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>
Thu, 26 Nov 2015 00:34:31 +0000 (16:34 -0800)
Merge changes from TFS


Trivial merge