Merge pull request dotnet/coreclr#6608 from dotnet-bot/from-tfs
authorAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>
Thu, 4 Aug 2016 21:40:42 +0000 (14:40 -0700)
committerGitHub <noreply@github.com>
Thu, 4 Aug 2016 21:40:42 +0000 (14:40 -0700)
Merge changes from TFS

Commit migrated from https://github.com/dotnet/coreclr/commit/aa1b532a49ded2966e56211c8cc2075cb307617f

1  2 
src/coreclr/src/vm/zapsig.cpp

Simple merge