]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 15 Dec 2012 18:26:38 +0000 (19:26 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 15 Dec 2012 18:26:38 +0000 (19:26 +0100)

Trivial merge