]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Null merge from 3.4
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 13 Apr 2015 17:49:35 +0000 (19:49 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 13 Apr 2015 17:49:35 +0000 (19:49 +0200)

Trivial merge