]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 5 Sep 2014 01:00:52 +0000 (21:00 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 5 Sep 2014 01:00:52 +0000 (21:00 -0400)

Trivial merge