Author: Armin Rigo
Branch: fast-gil
Changeset: r72229:ed9493101461
Date: 2014-06-25 19:33 +0200
http://bitbucket.org/pypy/pypy/changeset/ed9493101461/
Log:hg merge default
diff --git a/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
b/pypy/module/test_lib_pypy/cffi_tests/test_verify.py
Author: Armin Rigo
Branch: fast-gil
Changeset: r72201:8ae7ad71f087
Date: 2014-06-24 19:41 +0200
http://bitbucket.org/pypy/pypy/changeset/8ae7ad71f087/
Log:hg merge default
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -443,6