]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Aug 2015 03:13:43 +0000 (23:13 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Aug 2015 03:13:43 +0000 (23:13 -0400)

Trivial merge