]> granicus.if.org Git - python/commitdiff
Merge with 3.3
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 21 Jan 2014 20:37:16 +0000 (15:37 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 21 Jan 2014 20:37:16 +0000 (15:37 -0500)

Trivial merge