]> granicus.if.org Git - python/commitdiff
Merged from 3.4.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 20 Mar 2014 12:43:50 +0000 (12:43 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 20 Mar 2014 12:43:50 +0000 (12:43 +0000)

Trivial merge