]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Oct 2013 21:16:32 +0000 (23:16 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 12 Oct 2013 21:16:32 +0000 (23:16 +0200)

Trivial merge