]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 7 Jun 2014 08:28:16 +0000 (04:28 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 7 Jun 2014 08:28:16 +0000 (04:28 -0400)

Trivial merge