]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.4
authorAndrew Kuchling <amk@amk.ca>
Mon, 14 Apr 2014 17:52:34 +0000 (13:52 -0400)
committerAndrew Kuchling <amk@amk.ca>
Mon, 14 Apr 2014 17:52:34 +0000 (13:52 -0400)

Trivial merge