]> granicus.if.org Git - python/commitdiff
merge 3.5 (#24217)
authorBenjamin Peterson <benjamin@python.org>
Sun, 2 Aug 2015 19:16:54 +0000 (12:16 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 2 Aug 2015 19:16:54 +0000 (12:16 -0700)

Trivial merge