]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 8 Sep 2012 17:52:19 +0000 (20:52 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 8 Sep 2012 17:52:19 +0000 (20:52 +0300)

Trivial merge