]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 8 Jul 2012 12:00:06 +0000 (14:00 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 8 Jul 2012 12:00:06 +0000 (14:00 +0200)

Trivial merge