]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22484)
authorBenjamin Peterson <benjamin@python.org>
Thu, 25 Sep 2014 00:22:49 +0000 (20:22 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 25 Sep 2014 00:22:49 +0000 (20:22 -0400)

Trivial merge