]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 24 Aug 2012 17:47:02 +0000 (19:47 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 24 Aug 2012 17:47:02 +0000 (19:47 +0200)

Trivial merge