Author: Carl Friedrich Bolz
Branch: space-newtext
Changeset: r89180:8e2bcfb77e80
Date: 2016-12-19 14:47 +0100
http://bitbucket.org/pypy/pypy/changeset/8e2bcfb77e80/
Log:merge default
diff too long, truncating to 2000 out of 3192 lines
diff --git a/lib-python/2.7/weakref.py b/lib-python/2.7/
Author: Carl Friedrich Bolz
Branch: space-newtext
Changeset: r89093:b799e1db856f
Date: 2016-12-16 11:39 +0100
http://bitbucket.org/pypy/pypy/changeset/b799e1db856f/
Log:merge default
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
--- a/pypy/doc/contributor.rst
+++ b/pypy/do
Author: Carl Friedrich Bolz
Branch: space-newtext
Changeset: r89058:66c3c930e1f2
Date: 2016-12-13 16:54 +0100
http://bitbucket.org/pypy/pypy/changeset/66c3c930e1f2/
Log:merge default
diff --git a/lib_pypy/_pypy_wait.py b/lib_pypy/_pypy_wait.py
--- a/lib_pypy/_pypy_wait.py
+++ b/lib_pypy/_pyp
Author: Carl Friedrich Bolz
Branch: space-newtext
Changeset: r89060:8e5b0b6e8166
Date: 2016-12-14 17:42 +0100
http://bitbucket.org/pypy/pypy/changeset/8e5b0b6e8166/
Log:merge default
diff too long, truncating to 2000 out of 11227 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++
Author: Carl Friedrich Bolz
Branch: space-newtext
Changeset: r88776:67d4325b8871
Date: 2016-11-30 16:36 +0100
http://bitbucket.org/pypy/pypy/changeset/67d4325b8871/
Log:merge default
diff too long, truncating to 2000 out of 4915 lines
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py
Author: Carl Friedrich Bolz
Branch: space-newtext
Changeset: r88546:2e449c823765
Date: 2016-11-21 13:17 +0100
http://bitbucket.org/pypy/pypy/changeset/2e449c823765/
Log:merge default
diff too long, truncating to 2000 out of 30900 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgt
Author: Carl Friedrich Bolz
Branch: space-newtext
Changeset: r88080:ee5ad76cdf97
Date: 2016-11-02 14:11 +0100
http://bitbucket.org/pypy/pypy/changeset/ee5ad76cdf97/
Log:merge default
diff too long, truncating to 2000 out of 3090 lines
diff --git a/lib-python/2.7/test/test_ssl.py b/lib-pytho
