]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
(null merge 3.4)
authorBenjamin Peterson <benjamin@python.org>
Sun, 18 May 2014 03:02:28 +0000 (20:02 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 18 May 2014 03:02:28 +0000 (20:02 -0700)

Trivial merge