Merge branch 'sh/daemon'
authorJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:08:28 +0000 (02:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 24 Apr 2006 09:08:28 +0000 (02:08 -0700)
commitc6df547a415e4e34165df3d4af40f3eb2cb1cf4f
tree9b4745618d48b63bbea6ed8d18b233adbafdfdcf
parent2effe71b7c3a78cd20070752e04fb04830e4dd36
parent0032d548db56eac9ea09b4ba05843365f6325b85
Merge branch 'sh/daemon'

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