]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge 3.1
authorMatthias Klose <doko@ubuntu.com>
Wed, 14 Mar 2012 22:26:07 +0000 (23:26 +0100)
committerMatthias Klose <doko@ubuntu.com>
Wed, 14 Mar 2012 22:26:07 +0000 (23:26 +0100)

Trivial merge