Merge branch 'ew/keepalive' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:36 +0000 (11:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:36 +0000 (11:32 -0800)
commit2cb1ff9ac35ff043e377f78e36a57422a6846485
tree22e4c7269435e3d224605989e4c652f89355244a
parent474294963eb968da7a06650a65a4d17b4bde3ad2
parente47a8583a20256851e7fc882233e3bd5bf33dc6e
Merge branch 'ew/keepalive' into maint

* ew/keepalive:
  enable SO_KEEPALIVE for connected TCP sockets
connect.c