]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22265)
authorBenjamin Peterson <benjamin@python.org>
Sun, 24 Aug 2014 23:08:22 +0000 (18:08 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 24 Aug 2014 23:08:22 +0000 (18:08 -0500)

Trivial merge