]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:29:54 +0000 (02:29 +0200)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:29:54 +0000 (02:29 +0200)

Trivial merge