]> granicus.if.org Git - python/commitdiff
merge 3.5 (#25371)
authorBenjamin Peterson <benjamin@python.org>
Sun, 11 Oct 2015 02:32:41 +0000 (19:32 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 11 Oct 2015 02:32:41 +0000 (19:32 -0700)

Trivial merge