]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Sun, 31 May 2015 05:22:49 +0000 (00:22 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 31 May 2015 05:22:49 +0000 (00:22 -0500)

Trivial merge