[pypy-commit] pypy default: Document merged branch

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r80819:d983bf130cff
Date: 2015-11-21 16:41 +0000
http://bitbucket.org/pypy/pypy/changeset/d983bf130cff/

Log:	Document 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
@@ -13,3 +13,6 @@
 .. branch: osx-flat-namespace
 
 Fix the cpyext tests on OSX by linking with -flat_namespace
+
+.. branch: anntype
+Refactor and improve exception analysis in the annotator.