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

Trivial merge