]> granicus.if.org Git - python/commitdiff
merge 3.5 (#25569)
authorBenjamin Peterson <benjamin@python.org>
Sat, 14 Nov 2015 08:11:19 +0000 (00:11 -0800)
committerBenjamin Peterson <benjamin@python.org>
Sat, 14 Nov 2015 08:11:19 +0000 (00:11 -0800)

Trivial merge