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

2015-08-22 Thread arigo
Author: Armin Rigo 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/ins

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

2015-08-19 Thread arigo
Author: Armin Rigo Branch: Changeset: r2248:060045542075 Date: 2015-08-19 16:12 +0200 http://bitbucket.org/cffi/cffi/changeset/060045542075/ 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/ins