]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorKristján Valur Jónsson <sweskman@gmail.com>
Thu, 8 May 2014 11:18:27 +0000 (11:18 +0000)
committerKristján Valur Jónsson <sweskman@gmail.com>
Thu, 8 May 2014 11:18:27 +0000 (11:18 +0000)

Trivial merge