]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 6 Apr 2013 19:23:47 +0000 (21:23 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 6 Apr 2013 19:23:47 +0000 (21:23 +0200)

Trivial merge