]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 19 Sep 2014 21:30:21 +0000 (17:30 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 19 Sep 2014 21:30:21 +0000 (17:30 -0400)

Trivial merge