tree 6e09f1feae286f54b35851e414958a048fd5e19a
parent c1dc660cc3a98211c55c4e90fcfd80c218afde2b
parent f1cdc33d17f6ada964fc9ba18ac210c3f5b7f561
author Jan Tattermusch <jtattermusch@users.noreply.github.com> 1463674368 -0700
committer Jan Tattermusch <jtattermusch@users.noreply.github.com> 1463674368 -0700

Merge pull request #6641 from jtattermusch/backport_csharp_to_14_2

Backport C# changes to 0.14 branch