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

Trivial merge