[pypy-commit] pypy default: Add merged branch here

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r78469:1505ff62cfa8
Date: 2015-07-06 18:35 +0200
http://bitbucket.org/pypy/pypy/changeset/1505ff62cfa8/

Log:	Add merged branch here

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
@@ -32,3 +32,4 @@
 ``lst[0]`` is still *not* the float ``42.0`` but the integer ``42``.)
 
 .. branch: cffi-callback-onerror
+.. branch: cffi-new-allocator