]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 8 Jan 2015 04:49:06 +0000 (23:49 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 8 Jan 2015 04:49:06 +0000 (23:49 -0500)

Trivial merge