From: Junio C Hamano <junkio@cox.net>
Date: Tue, 18 Apr 2006 21:41:57 +0000 (-0700)
Subject: Merge branch 'sh/daemon' into next
X-Git-Tag: v1.4.1-rc1~206
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4935e0553f052da7661c0b93a451a5320f530a45;p=git.git

Merge branch 'sh/daemon' into next

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

4935e0553f052da7661c0b93a451a5320f530a45