From: Junio C Hamano <junkio@cox.net>
Date: Mon, 24 Apr 2006 09:08:28 +0000 (-0700)
Subject: Merge branch 'sh/daemon'
X-Git-Tag: v1.4.0-rc1~220
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c6df547a415e4e34165df3d4af40f3eb2cb1cf4f;p=git.git

Merge branch 'sh/daemon'

* sh/daemon:
  socksetup: don't return on set_reuse_addr() error
---

c6df547a415e4e34165df3d4af40f3eb2cb1cf4f