]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 12 Sep 2012 16:02:18 +0000 (18:02 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 12 Sep 2012 16:02:18 +0000 (18:02 +0200)

Trivial merge