[pypy-commit] pypy default: add merged branch

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r81373:365503b19799
Date: 2015-12-18 15:47 +0100
http://bitbucket.org/pypy/pypy/changeset/365503b19799/

Log:	add merged 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
@@ -84,3 +84,4 @@
 
 .. branch: test-AF_NETLINK
 .. branch: small-cleanups-misc
+.. branch: cpyext-slotdefs