]> granicus.if.org Git - python/commitdiff
merge 3.4 (#21128)
authorBenjamin Peterson <benjamin@python.org>
Fri, 4 Apr 2014 17:59:46 +0000 (13:59 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 4 Apr 2014 17:59:46 +0000 (13:59 -0400)

Trivial merge