]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 4 Aug 2012 14:17:10 +0000 (16:17 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 4 Aug 2012 14:17:10 +0000 (16:17 +0200)

Trivial merge