[pypy-commit] cffi release-1.11: hg merge default

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: release-1.11
Changeset: r3032:d3e081232b0b
Date: 2017-09-27 13:25 +0200
http://bitbucket.org/cffi/cffi/changeset/d3e081232b0b/

Log:	hg merge default

diff --git a/doc/source/whatsnew.rst b/doc/source/whatsnew.rst
--- a/doc/source/whatsnew.rst
+++ b/doc/source/whatsnew.rst
@@ -10,6 +10,8 @@
 
 * Fix for 3.6.0/3.6.1 being incompatible with each other unless we hack
   (cpython issue `#29943`_)
+
+* Fix for 3.7.0a1+ (it didn't run successfully in CPython's 3.7 branch)
   
 .. _`#29943`: https://bugs.python.org/issue29943