[pypy-commit] pypy cffi-char16-char32: ready to merge

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: cffi-char16-char32
Changeset: r91517:0f1cd402bb00
Date: 2017-06-05 08:23 +0200
http://bitbucket.org/pypy/pypy/changeset/0f1cd402bb00/

Log:	ready to merge

diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -6,5 +6,6 @@
 .. startrev: 558bd00b3dd8
 
 .. branch: cffi-complex
+.. branch: cffi-char16-char32
 
-Part of the upgrade to cffi 1.11
+The two ``cffi-*`` branches are part of the upgrade to cffi 1.11.