[pypy-commit] pypy cells-local-stack: merge default

2015-05-12 Thread cfbolz
Author: Carl Friedrich Bolz Branch: cells-local-stack Changeset: r77299:93e76a7a9923 Date: 2015-05-12 17:07 +0200 http://bitbucket.org/pypy/pypy/changeset/93e76a7a9923/ Log:merge default diff --git a/lib-python/2.7/socket.py b/lib-python/2.7/socket.py --- a/lib-python/2.7/socket.py +++ b/lib

[pypy-commit] pypy cells-local-stack: merge default

2015-05-08 Thread cfbolz
Author: Carl Friedrich Bolz Branch: cells-local-stack Changeset: r77225:f983d4b8a743 Date: 2015-05-08 18:00 +0200 http://bitbucket.org/pypy/pypy/changeset/f983d4b8a743/ Log:merge default diff too long, truncating to 2000 out of 60166 lines diff --git a/.gitignore b/.gitignore --- a/.gitigno