]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 26 Jul 2014 23:40:31 +0000 (19:40 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 26 Jul 2014 23:40:31 +0000 (19:40 -0400)

Trivial merge