]> granicus.if.org Git - python/commitdiff
merge 3.4 (#21355)
authorBenjamin Peterson <benjamin@python.org>
Sat, 26 Apr 2014 17:36:35 +0000 (13:36 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 26 Apr 2014 17:36:35 +0000 (13:36 -0400)

Trivial merge