]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 12 Jul 2013 20:19:41 +0000 (21:19 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 12 Jul 2013 20:19:41 +0000 (21:19 +0100)

Trivial merge