]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23210)
authorBenjamin Peterson <benjamin@python.org>
Fri, 9 Jan 2015 22:40:38 +0000 (16:40 -0600)
committerBenjamin Peterson <benjamin@python.org>
Fri, 9 Jan 2015 22:40:38 +0000 (16:40 -0600)

Trivial merge