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

Author: Armin Rigo Branch: cffi-static-callback-embedding Changeset: r81801:96823f281a0c Date: 2016-01-15 13:25 + http://bitbucket.org/pypy/pypy/changeset/96823f281a0c/ Log:hg merge default diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -39,5 +39,5 @@ # runs. We cann

[pypy-commit] pypy cffi-static-callback-embedding: hg merge default (including the ec-keepalive branch)

Author: Armin Rigo Branch: cffi-static-callback-embedding Changeset: r81585:7b81fa1c3fa9 Date: 2016-01-05 15:01 +0100 http://bitbucket.org/pypy/pypy/changeset/7b81fa1c3fa9/ Log:hg merge default (including the ec-keepalive branch) diff --git a/lib-python/2.7/pickle.py b/lib-python/2.7/pickle.