]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#11979: merge with 3.1.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 14 May 2011 06:23:52 +0000 (09:23 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 14 May 2011 06:23:52 +0000 (09:23 +0300)

Trivial merge