]> granicus.if.org Git - python/commitdiff
Issue #10141, Issue 20065: Merged from 3.4.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 21 Mar 2014 11:45:27 +0000 (11:45 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 21 Mar 2014 11:45:27 +0000 (11:45 +0000)

Trivial merge