]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 20 Mar 2014 17:40:03 +0000 (12:40 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 20 Mar 2014 17:40:03 +0000 (12:40 -0500)

Trivial merge