[pypy-commit] pypy cffi-handle-lifetime: hg merge default

Author: Armin Rigo Branch: cffi-handle-lifetime Changeset: r80143:87fadac2e7a3 Date: 2015-10-12 18:37 +0200 http://bitbucket.org/pypy/pypy/changeset/87fadac2e7a3/ Log:hg merge default diff --git a/rpython/rlib/rvmprof/cintf.py b/rpython/rlib/rvmprof/cintf.py --- a/rpython/rlib/rvmprof/cintf.

[pypy-commit] pypy cffi-handle-lifetime: hg merge default

Author: Armin Rigo Branch: cffi-handle-lifetime Changeset: r80141:a698430306bd Date: 2015-10-12 17:37 +0200 http://bitbucket.org/pypy/pypy/changeset/a698430306bd/ Log:hg merge default diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py --- a/rpython/annotator/annrp