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

Trivial merge