tree b33e93553f443aae00ffb3fcb324cdb867eea1b1
parent 7f1068e21e5840fca0787f0925e62148b2f873ed
parent e47a8583a20256851e7fc882233e3bd5bf33dc6e
author Junio C Hamano <gitster@pobox.com> 1324339592 -0800
committer Junio C Hamano <gitster@pobox.com> 1324339592 -0800

Merge branch 'ew/keepalive'

* ew/keepalive:
  enable SO_KEEPALIVE for connected TCP sockets