[pypy-commit] pypy release-2.5.x: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: release-2.5.x
Changeset: r76387:9cf558f55103
Date: 2015-03-15 21:41 +0100
http://bitbucket.org/pypy/pypy/changeset/9cf558f55103/

Log:	merge heads

diff --git a/pypy/doc/release-2.5.1.rst b/pypy/doc/release-2.5.1.rst
--- a/pypy/doc/release-2.5.1.rst
+++ b/pypy/doc/release-2.5.1.rst
@@ -1,5 +1,5 @@
 ==============================
-PyPy 2.5.1 - XXXXXXXXXXXXXXXXX
+PyPy 2.5.1 - Hakea Hookeriana
 ==============================
 
 We're pleased to announce PyPy 2.5.1, following on the heels of 2.5.0