]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 13 Apr 2015 17:48:52 +0000 (19:48 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 13 Apr 2015 17:48:52 +0000 (19:48 +0200)

Trivial merge