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

Trivial merge