Merge branch 'as/daemon-multi-listen'

* as/daemon-multi-listen:
  daemon: allow more than one host address given via --listen
  daemon: add helper function named_sock_setup

diff --cc Documentation/git-daemon.txt
index 2f0ddf6fe817ab7b59fb5f5276ba688447661ee3,685aa58cec823e69acc8f247e019ebdb8e9415ce..5054f790a140b43640d1e4d68a032d95da3daaca
--- 1/Documentation/git-daemon.txt
--- 2/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@@ -85,12 -85,13 +85,13 @@@ OPTION
        be either an IPv4 address or an IPv6 address if supported.  If IPv6
        is not supported, then --listen=hostname is also not supported and
        --listen must be given an IPv4 address.
+       Can be given more than once.
        Incompatible with '--inetd' option.
  
 ---port=n::
 +--port=<n>::
        Listen on an alternative port.  Incompatible with '--inetd' option.
  
 ---init-timeout=n::
 +--init-timeout=<n>::
        Timeout between the moment the connection is established and the
        client request is received (typically a rather low value, since
        that should be basically immediate).

diff --cc daemon.c
Simple merge