]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sun, 11 Oct 2015 06:24:39 +0000 (23:24 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 11 Oct 2015 06:24:39 +0000 (23:24 -0700)

Trivial merge