Merge branch 'nd/daemon-log-sock-errors' into next
commit5f3630f46e6176439739d53954d4b3ddd363e64a
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:00 +0000 (6 15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Oct 2011 22:42:00 +0000 (6 15:42 -0700)
tree81479154e857ee146f28794ec861d77ca9db9665
parent7e3083f3fe64ec99bba3689efc6c69da585cacf2
parent089d82e8a6d6443e10052f04c469e9e70784eb93
Merge branch 'nd/daemon-log-sock-errors' into next

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