]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 25 Jun 2014 02:21:56 +0000 (22:21 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 25 Jun 2014 02:21:56 +0000 (22:21 -0400)

Trivial merge