]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Wed, 27 May 2015 23:32:53 +0000 (18:32 -0500)
committerBenjamin Peterson <benjamin@python.org>
Wed, 27 May 2015 23:32:53 +0000 (18:32 -0500)

Trivial merge