]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 29 Sep 2011 05:36:23 +0000 (08:36 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 29 Sep 2011 05:36:23 +0000 (08:36 +0300)

Trivial merge