]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 12 Oct 2015 06:03:41 +0000 (23:03 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 12 Oct 2015 06:03:41 +0000 (23:03 -0700)

Trivial merge