]> granicus.if.org Git - python/commitdiff
merge 3.4 (#17210)
authorBenjamin Peterson <benjamin@python.org>
Sat, 19 Jul 2014 23:35:08 +0000 (16:35 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 19 Jul 2014 23:35:08 +0000 (16:35 -0700)

Trivial merge