[pypy-commit] pypy default: document merged branches

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r85714:9540c130a102
Date: 2016-07-14 14:50 -0500
http://bitbucket.org/pypy/pypy/changeset/9540c130a102/

Log:	document merged branches

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
@@ -72,3 +72,12 @@
 column might also not show the reduction, particularly on Linux >= 4.5 or
 on OS/X: it uses MADV_FREE, which only marks the pages as returnable to
 the OS if the memory is low.
+
+.. branch: cpyext-slotdefs2
+
+Fill in more slots when creating a PyTypeObject from a W_TypeObject
+More slots are still TBD, like tp_print and richcmp
+
+.. branch: json-surrogates
+
+Align json module decode with the cpython's impl, fixes issue 2345