]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#14770: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 13 May 2012 17:17:40 +0000 (20:17 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 13 May 2012 17:17:40 +0000 (20:17 +0300)

Trivial merge