]> granicus.if.org Git - python/commitdiff
merge 3.5 (#26046)
authorBenjamin Peterson <benjamin@python.org>
Fri, 8 Jan 2016 06:02:13 +0000 (22:02 -0800)
committerBenjamin Peterson <benjamin@python.org>
Fri, 8 Jan 2016 06:02:13 +0000 (22:02 -0800)

Trivial merge