Jisi Liu 58860c021f Merge remote-tracking branch 'origin/3.0.x' into merge %!s(int64=9) %!d(string=hai) anos
..
internal 64958cdb1d Fix to typo/oversight in python tests %!s(int64=9) %!d(string=hai) anos
pyext 9086d96439 Integrate from internal code base. %!s(int64=9) %!d(string=hai) anos
__init__.py 6e11540b32 Bump version number to 3.0.2 %!s(int64=9) %!d(string=hai) anos
descriptor.py 3808d091f8 Fix spelling in strings and comments %!s(int64=9) %!d(string=hai) anos
descriptor_database.py e841bac4fc Down-integrate from internal code base. %!s(int64=10) %!d(string=hai) anos
descriptor_pool.py d64a2d9941 Integrated internal changes from Google %!s(int64=9) %!d(string=hai) anos
json_format.py 3886860aa4 Typo: beffer -> buffer %!s(int64=9) %!d(string=hai) anos
message.py cf14183bcd Down integrate from Google internal. %!s(int64=10) %!d(string=hai) anos
message_factory.py e841bac4fc Down-integrate from internal code base. %!s(int64=10) %!d(string=hai) anos
proto_builder.py 46e8ff63cb Down-integrate from google internal. %!s(int64=10) %!d(string=hai) anos
reflection.py 9086d96439 Integrate from internal code base. %!s(int64=9) %!d(string=hai) anos
service.py e428862450 Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers %!s(int64=11) %!d(string=hai) anos
service_reflection.py e428862450 Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers %!s(int64=11) %!d(string=hai) anos
symbol_database.py 9086d96439 Integrate from internal code base. %!s(int64=9) %!d(string=hai) anos
text_encoding.py 46e8ff63cb Down-integrate from google internal. %!s(int64=10) %!d(string=hai) anos
text_format.py b83af525db Fixed string formatting in text_format.py to be Python2.6-compatible %!s(int64=9) %!d(string=hai) anos