]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 16 Apr 2014 03:44:37 +0000 (23:44 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 16 Apr 2014 03:44:37 +0000 (23:44 -0400)

Trivial merge