]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 24 Jun 2012 15:23:12 +0000 (17:23 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 24 Jun 2012 15:23:12 +0000 (17:23 +0200)

Trivial merge