]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 13 Jul 2012 18:59:35 +0000 (20:59 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 13 Jul 2012 18:59:35 +0000 (20:59 +0200)

Trivial merge