]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22528)
authorBenjamin Peterson <benjamin@python.org>
Tue, 30 Sep 2014 20:02:26 +0000 (16:02 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 30 Sep 2014 20:02:26 +0000 (16:02 -0400)

Trivial merge