Author: Armin Rigo
Branch: stmgc-c4
Changeset: r66904:287326e8e482
Date: 2013-09-11 15:46 +0200
http://bitbucket.org/pypy/pypy/changeset/287326e8e482/
Log:hg merge default
diff --git a/lib-python/2.7/argparse.py b/lib-python/2.7/argparse.py
--- a/lib-python/2.7/argparse.py
+++ b/lib-python/2
Author: Armin Rigo
Branch: stmgc-c4
Changeset: r66881:6bcc88ab4f2b
Date: 2013-09-09 22:17 +0200
http://bitbucket.org/pypy/pypy/changeset/6bcc88ab4f2b/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/wha
Author: Armin Rigo
Branch: stmgc-c4
Changeset: r66871:a206090d8a53
Date: 2013-09-09 19:13 +0200
http://bitbucket.org/pypy/pypy/changeset/a206090d8a53/
Log:hg merge default
diff --git a/rpython/rtyper/lltypesystem/opimpl.py
b/rpython/rtyper/lltypesystem/opimpl.py
--- a/rpython/rtyper/lltypes
Author: Armin Rigo
Branch: stmgc-c4
Changeset: r66866:781dce1d3438
Date: 2013-09-09 18:25 +0200
http://bitbucket.org/pypy/pypy/changeset/781dce1d3438/
Log:hg merge default
diff --git a/lib_pypy/_tkinter/__init__.py b/lib_pypy/_tkinter/__init__.py
--- a/lib_pypy/_tkinter/__init__.py
+++ b/lib