]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 4 Mar 2012 19:59:01 +0000 (20:59 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 4 Mar 2012 19:59:01 +0000 (20:59 +0100)

Trivial merge