]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Thu, 2 Jul 2015 03:36:37 +0000 (22:36 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 2 Jul 2015 03:36:37 +0000 (22:36 -0500)

Trivial merge