]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Mon, 6 Jul 2015 16:28:47 +0000 (11:28 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 6 Jul 2015 16:28:47 +0000 (11:28 -0500)

Trivial merge