]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23167)
authorBenjamin Peterson <benjamin@python.org>
Sun, 4 Jan 2015 22:30:13 +0000 (16:30 -0600)
committerBenjamin Peterson <benjamin@python.org>
Sun, 4 Jan 2015 22:30:13 +0000 (16:30 -0600)

Trivial merge