carto/protobuf @ 5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd

Adam Cozzette 5d63097fc2 Merge branch 'master' into down-integrate-with-msvc-fix		%!s(int64=9) %!d(string=hai) anos
..
protobuf	5d63097fc2 Merge branch 'master' into down-integrate-with-msvc-fix	%!s(int64=9) %!d(string=hai) anos
__init__.py	786f80fe66 Add a modified patch from craigcitro@ to handle namespace sharing.	%!s(int64=10) %!d(string=hai) anos