]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 27 Feb 2012 00:01:54 +0000 (01:01 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 27 Feb 2012 00:01:54 +0000 (01:01 +0100)

Trivial merge