]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Thu, 4 Jun 2015 19:34:43 +0000 (14:34 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 4 Jun 2015 19:34:43 +0000 (14:34 -0500)

Trivial merge