[pypy-commit] pypy release-2.3.x: merge default into branch

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: release-2.3.x
Changeset: r71323:b40b13f73bbc
Date: 2014-05-06 11:47 +0300
http://bitbucket.org/pypy/pypy/changeset/b40b13f73bbc/

Log:	merge default into branch

diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst
--- a/pypy/doc/how-to-release.rst
+++ b/pypy/doc/how-to-release.rst
@@ -28,7 +28,10 @@
   pypy/doc/tool/makecontributor.py generates the list of contributors
 * rename pypy/doc/whatsnew_head.rst to whatsnew_VERSION.rst
   and create a fresh whatsnew_head.rst after the release
-* update README
+* merge PYPY_IRC_TOPIC environment variable handling from previous release
+  in pypy/doc/getting-started-dev.rst, pypy/doc/man/pypy.1.rst, and
+  pypy/interpreter/app_main.py so release versions will not print a random
+  IRC topic by default.
 * change the tracker to have a new release tag to file bugs against
 * go to pypy/tool/release and run:
   force-builds.py <release branch>