]> granicus.if.org Git - python/commitdiff
Merge with 3.3
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 22 Jan 2014 01:45:38 +0000 (20:45 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 22 Jan 2014 01:45:38 +0000 (20:45 -0500)

Trivial merge