]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 29 May 2014 05:46:48 +0000 (01:46 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 29 May 2014 05:46:48 +0000 (01:46 -0400)

Trivial merge