]> granicus.if.org Git - python/commitdiff
Merge 3.4.
authorBarry Warsaw <barry@python.org>
Tue, 2 Dec 2014 16:31:10 +0000 (11:31 -0500)
committerBarry Warsaw <barry@python.org>
Tue, 2 Dec 2014 16:31:10 +0000 (11:31 -0500)

Trivial merge