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

Trivial merge