]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 30 Mar 2013 15:29:54 +0000 (16:29 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 30 Mar 2013 15:29:54 +0000 (16:29 +0100)

Trivial merge