]> granicus.if.org Git - python/commitdiff
merge 3.4 (#26066)
authorBenjamin Peterson <benjamin@python.org>
Sun, 10 Jan 2016 07:56:31 +0000 (23:56 -0800)
committerBenjamin Peterson <benjamin@python.org>
Sun, 10 Jan 2016 07:56:31 +0000 (23:56 -0800)

Trivial merge