]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22036)
authorBenjamin Peterson <benjamin@python.org>
Thu, 24 Jul 2014 04:39:59 +0000 (21:39 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 24 Jul 2014 04:39:59 +0000 (21:39 -0700)

Trivial merge