]> granicus.if.org Git - python/commitdiff
merge 3.5 (#25245)
authorBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 08:16:20 +0000 (01:16 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 08:16:20 +0000 (01:16 -0700)

Trivial merge