]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sat, 20 Sep 2014 15:53:27 +0000 (11:53 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sat, 20 Sep 2014 15:53:27 +0000 (11:53 -0400)

Trivial merge