]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 3.5 (socket)
authorVictor Stinner <victor.stinner@gmail.com>
Mon, 27 Jul 2015 21:39:22 +0000 (23:39 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Mon, 27 Jul 2015 21:39:22 +0000 (23:39 +0200)

Trivial merge