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

Trivial merge