]> granicus.if.org Git - python/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Thu, 19 Mar 2015 23:10:23 +0000 (00:10 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Thu, 19 Mar 2015 23:10:23 +0000 (00:10 +0100)

Trivial merge