Merge pull request #2192 from google/3.0.x · bithium/protobuf@0977514 · GitHub

Commit

Merge pull request protocolbuffers#2192 from google/3.0.x

Browse files

Merge 3.0.x into master.

Loading branch information

liujisi authored Sep 27, 2016

2 parents 1b66ef7 + 37f1116 commit 0977514