]> granicus.if.org Git - python/commitdiff
merge 3.5
authorBenjamin Peterson <benjamin@python.org>
Wed, 4 Nov 2015 06:42:42 +0000 (22:42 -0800)
committerBenjamin Peterson <benjamin@python.org>
Wed, 4 Nov 2015 06:42:42 +0000 (22:42 -0800)

Trivial merge