Merge pull request #3015 from bmiklautz/pull/2936
authorakallabeth <akallabeth@users.noreply.github.com>
Tue, 23 Feb 2016 15:46:16 +0000 (16:46 +0100)
committerakallabeth <akallabeth@users.noreply.github.com>
Tue, 23 Feb 2016 15:46:16 +0000 (16:46 +0100)
tcp: change TCP_USER_TIMEOUT to 16000


Trivial merge