]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.4
authorAndrew Kuchling <amk@amk.ca>
Fri, 25 Apr 2014 13:35:26 +0000 (09:35 -0400)
committerAndrew Kuchling <amk@amk.ca>
Fri, 25 Apr 2014 13:35:26 +0000 (09:35 -0400)

Trivial merge