Merge branch 'nd/daemon-log-sock-errors'
commit719c09fdad63506f45afdd1ad5b65d79cb879e90
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:21 +0000 (13 19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:21 +0000 (13 19:03 -0700)
treec7ed5a40f548e79b0a49db88e0cf81b8c2bd3b53
parent862623880047cbeb776d1ec4676fe41d8f06dd4d
parent089d82e8a6d6443e10052f04c469e9e70784eb93
Merge branch 'nd/daemon-log-sock-errors'

* nd/daemon-log-sock-errors:
  daemon: log errors if we could not use some sockets