Merge pull request #1334 from dotnet-bot/from-tfs
authorJan Kotas <jkotas@microsoft.com>
Mon, 3 Aug 2015 19:18:31 +0000 (12:18 -0700)
committerJan Kotas <jkotas@microsoft.com>
Mon, 3 Aug 2015 19:18:31 +0000 (12:18 -0700)
Merge changes from TFS


Trivial merge