]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Thu, 17 May 2012 19:04:49 +0000 (21:04 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Thu, 17 May 2012 19:04:49 +0000 (21:04 +0200)

Trivial merge