]> granicus.if.org Git - python/commitdiff
Merge 3.5 (#24883)
authorBenjamin Peterson <benjamin@python.org>
Tue, 18 Aug 2015 06:38:55 +0000 (23:38 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 18 Aug 2015 06:38:55 +0000 (23:38 -0700)

Trivial merge