[pypy-commit] cffi default: hg merge release-1.2

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r2254:f78386adce4f
Date: 2015-08-22 16:10 +0200
http://bitbucket.org/cffi/cffi/changeset/f78386adce4f/

Log:	hg merge release-1.2

diff --git a/doc/source/installation.rst b/doc/source/installation.rst
--- a/doc/source/installation.rst
+++ b/doc/source/installation.rst
@@ -53,9 +53,9 @@
 
 * http://pypi.python.org/packages/source/c/cffi/cffi-1.2.1.tar.gz
 
-   - MD5: ...
+   - MD5: faca1e420e80433db409bb1bdd0a3f45
 
-   - SHA: ...
+   - SHA: f7ed014ff1602a8e81073f5356b4cafbc3f5dce1
 
 * Or grab the most current version from the `Bitbucket page`_:
   ``hg clone https://bitbucket.org/cffi/cffi``
diff --git a/doc/source/whatsnew.rst b/doc/source/whatsnew.rst
--- a/doc/source/whatsnew.rst
+++ b/doc/source/whatsnew.rst
@@ -3,7 +3,7 @@
 ======================
 
 
-v1.2.0
+v1.2.1
 ======
 
 * Out-of-line mode: ``int a[][...];`` can be used to declare a structure