carto/protobuf @ 94aa50ffd6e8994c1ec9c09cc596ec77692e6be7

Jisi Liu 0de06f54bc Merge branch 'master' of github.com:google/protobuf		%!s(int64=9) %!d(string=hai) anos
..
protobuf	0de06f54bc Merge branch 'master' of github.com:google/protobuf	%!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