]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 17 Feb 2013 00:05:46 +0000 (01:05 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 17 Feb 2013 00:05:46 +0000 (01:05 +0100)

Trivial merge