Adam Cozzette afe96b6d42 Merge branch 'master' into down-integrate %!s(int64=8) %!d(string=hai) anos
..
protobuf afe96b6d42 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=10) %!d(string=hai) anos