Merge pull request #1895 from google/3.0.0-GA

Merge GA branch for makedist fix.

Makefile.am

@@ -656,6 +656,7 @@ python_EXTRA_DIST=                                                           \
   python/google/protobuf/text_encoding.py                                    \
   python/google/protobuf/text_format.py                                      \
   python/mox.py                                                              \
+  python/setup.cfg                                                           \
   python/setup.py                                                            \
   python/stubout.py                                                          \
   python/tox.ini                                                             \