]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Dummy merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 16 Jul 2011 21:52:42 +0000 (23:52 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 16 Jul 2011 21:52:42 +0000 (23:52 +0200)

Trivial merge