]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 30 Jun 2012 15:33:13 +0000 (17:33 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 30 Jun 2012 15:33:13 +0000 (17:33 +0200)

Trivial merge