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

Trivial merge