]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:13:10 +0000 (11:13 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 1 Jan 2016 17:13:10 +0000 (11:13 -0600)

Trivial merge