Hao Nguyen 86bc27d220 Merge branch 'master' of https://github.com/protocolbuffers/protobuf %!s(int64=6) %!d(string=hai) anos
..
protobuf 86bc27d220 Merge branch 'master' of https://github.com/protocolbuffers/protobuf %!s(int64=6) %!d(string=hai) anos
__init__.py 786f80fe66 Add a modified patch from craigcitro@ to handle namespace sharing. %!s(int64=10) %!d(string=hai) anos