]> granicus.if.org Git - python/commitdiff
merge 3.4 (#21587)
authorBenjamin Peterson <benjamin@python.org>
Mon, 26 May 2014 22:12:43 +0000 (15:12 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 26 May 2014 22:12:43 +0000 (15:12 -0700)

Trivial merge