]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Wed, 3 Jun 2015 05:04:52 +0000 (00:04 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 3 Jun 2015 05:04:52 +0000 (00:04 -0500)

Trivial merge