]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Thu, 17 Apr 2014 22:29:27 +0000 (18:29 -0400)
committerBenjamin Peterson <benjamin@python.org>
Thu, 17 Apr 2014 22:29:27 +0000 (18:29 -0400)

Trivial merge