]> granicus.if.org Git - python/commitdiff
merge 3.4 (#21764)
authorBenjamin Peterson <benjamin@python.org>
Sun, 15 Jun 2014 01:52:14 +0000 (18:52 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 15 Jun 2014 01:52:14 +0000 (18:52 -0700)

Trivial merge