]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 May 2012 21:43:55 +0000 (23:43 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 May 2012 21:43:55 +0000 (23:43 +0200)

Trivial merge