]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22380)
authorBenjamin Peterson <benjamin@python.org>
Wed, 10 Sep 2014 21:13:36 +0000 (17:13 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 10 Sep 2014 21:13:36 +0000 (17:13 -0400)

Trivial merge