]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorVictor Stinner <victor.stinner@gmail.com>
Sat, 15 Jun 2013 01:37:45 +0000 (03:37 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Sat, 15 Jun 2013 01:37:45 +0000 (03:37 +0200)

Trivial merge