]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.4
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Fri, 8 May 2015 11:15:11 +0000 (14:15 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Fri, 8 May 2015 11:15:11 +0000 (14:15 +0300)

Trivial merge