[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r65290:8557e3918b25
Date: 2013-07-09 15:05 +0200
http://bitbucket.org/pypy/pypy/changeset/8557e3918b25/

Log:	merge

diff --git a/pypy/doc/release-2.1.0-beta1.rst b/pypy/doc/release-2.1.0-beta1.rst
--- a/pypy/doc/release-2.1.0-beta1.rst
+++ b/pypy/doc/release-2.1.0-beta1.rst
@@ -2,7 +2,7 @@
 PyPy 2.1 beta 1
 ===============
 
-We're pleased to announce the first beta of the upcomming 2.1 release of PyPy.
+We're pleased to announce the first beta of the upcoming 2.1 release of PyPy.
 This beta contains many bugfixes and improvements, numerous improvements to the
 numpy in pypy effort. The main feature being that the ARM processor support is
 not longer considered alpha level. We would like to thank the `Raspberry Pi