]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 20 Sep 2014 02:54:27 +0000 (22:54 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 20 Sep 2014 02:54:27 +0000 (22:54 -0400)

Trivial merge