]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.4
authorGuido van Rossum <guido@python.org>
Fri, 18 Apr 2014 16:13:12 +0000 (09:13 -0700)
committerGuido van Rossum <guido@python.org>
Fri, 18 Apr 2014 16:13:12 +0000 (09:13 -0700)

Trivial merge