]> granicus.if.org Git - python/commitdiff
merge 3.5 (#26378)
authorBenjamin Peterson <benjamin@python.org>
Thu, 18 Feb 2016 07:43:08 +0000 (23:43 -0800)
committerBenjamin Peterson <benjamin@python.org>
Thu, 18 Feb 2016 07:43:08 +0000 (23:43 -0800)

Trivial merge