]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 5 Aug 2012 12:53:49 +0000 (14:53 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 5 Aug 2012 12:53:49 +0000 (14:53 +0200)

Trivial merge