]> granicus.if.org Git - python/commitdiff
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Fri, 18 Apr 2014 05:04:07 +0000 (01:04 -0400)
committerBenjamin Peterson <benjamin@python.org>
Fri, 18 Apr 2014 05:04:07 +0000 (01:04 -0400)

Trivial merge