]> granicus.if.org Git - python/commitdiff
merge 3.5 (#25076)
authorBenjamin Peterson <benjamin@python.org>
Sun, 13 Sep 2015 00:21:24 +0000 (17:21 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 13 Sep 2015 00:21:24 +0000 (17:21 -0700)

Trivial merge