]> granicus.if.org Git - python/commitdiff
merge 3.4 (#21330)
authorBenjamin Peterson <benjamin@python.org>
Wed, 23 Apr 2014 01:55:07 +0000 (21:55 -0400)
committerBenjamin Peterson <benjamin@python.org>
Wed, 23 Apr 2014 01:55:07 +0000 (21:55 -0400)

Trivial merge