Merge branch 'sh/daemon' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 21:41:57 +0000 (14:41 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 18 Apr 2006 21:41:57 +0000 (14:41 -0700)
commit4935e0553f052da7661c0b93a451a5320f530a45
tree64bd83f64eba9e22a5ef7f6cde08de9ab6cdf2ff
parentd3d9681a0fc23a47d48b5df296cd267b0b6055b2
parent0032d548db56eac9ea09b4ba05843365f6325b85
Merge branch 'sh/daemon' into next

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