carto/protobuf @ 526b350199e604b62daaee9febc5d8a8d593a010

Adam Cozzette 94d55e5292 Merge branch '3.6.x' into merge-3-6-x		%!s(int64=7) %!d(string=hai) anos
..
protobuf	94d55e5292 Merge branch '3.6.x' into merge-3-6-x	%!s(int64=7) %!d(string=hai) anos
__init__.py	786f80fe66 Add a modified patch from craigcitro@ to handle namespace sharing.	%!s(int64=10) %!d(string=hai) anos