]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 15 Feb 2012 21:30:29 +0000 (22:30 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 15 Feb 2012 21:30:29 +0000 (22:30 +0100)

Trivial merge