]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 14 May 2015 22:11:14 +0000 (18:11 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 14 May 2015 22:11:14 +0000 (18:11 -0400)

Trivial merge