]> granicus.if.org Git - python/commitdiff
Merge 3.4.
authorBarry Warsaw <barry@python.org>
Mon, 1 Dec 2014 23:16:12 +0000 (18:16 -0500)
committerBarry Warsaw <barry@python.org>
Mon, 1 Dec 2014 23:16:12 +0000 (18:16 -0500)

Trivial merge