]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorVictor Stinner <victor.stinner@haypocalc.com>
Sat, 17 Dec 2011 21:40:19 +0000 (22:40 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Sat, 17 Dec 2011 21:40:19 +0000 (22:40 +0100)

Trivial merge