]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 4 May 2012 21:17:03 +0000 (23:17 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 4 May 2012 21:17:03 +0000 (23:17 +0200)

Trivial merge