[pypy-commit] pypy default: document merge branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r84871:fe2da372ab19
Date: 2016-06-01 22:17 +0300
http://bitbucket.org/pypy/pypy/changeset/fe2da372ab19/

Log:	document merge branch

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
@@ -125,4 +125,9 @@
 
 .. branch: traceviewer-common-merge-point-formats
 
-Teach RPython JIT's off-line traceviewer the most common ``debug_merge_point`` formats.
\ No newline at end of file
+Teach RPython JIT's off-line traceviewer the most common ``debug_merge_point`` formats.
+
+.. branch: cpyext-pickle
+
+Enable pickling of W_PyCFunctionObject by monkeypatching pickle.Pickler.dispatch
+at cpyext import time