carto/protobuf @ 0316ae802d643b2842dbf2c0089dade1559c6f06

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