[pypy-commit] pypy cffi-static-callback: hg merge default

2015-11-16 Thread arigo
Author: Armin Rigo Branch: cffi-static-callback Changeset: r80709:fe63dabf7c80 Date: 2015-11-16 11:12 + http://bitbucket.org/pypy/pypy/changeset/fe63dabf7c80/ Log:hg merge default diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -56,14 +56,15 @@ Anders Chrigstrom Eric

[pypy-commit] pypy cffi-static-callback: hg merge default

2015-11-15 Thread arigo
Author: Armin Rigo Branch: cffi-static-callback Changeset: r80683:e632713d7182 Date: 2015-11-15 13:35 +0100 http://bitbucket.org/pypy/pypy/changeset/e632713d7182/ Log:hg merge default diff --git a/lib_pypy/cffi.egg-info/PKG-INFO b/lib_pypy/cffi.egg-info/PKG-INFO --- a/lib_pypy/cffi.egg-info/