Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into next
commit1eb279f320b43b3260f5accbba5415d52a00fbd5
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:14:44 +0000 (5 21:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:14:44 +0000 (5 21:14 -0700)
tree65bdedcb4f94ab0db15fcbc1ba5d36ca821a3e84
parenta30464c55768b3383804c5c503ab716a833b65e9
parentd358f771e3a0e78ea8ebed7edf48a12a7620c813
Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into next

"git daemon" fails to build from the source under NO_IPV6
configuration (regression in 2.4).

* jc/daemon-no-ipv6-for-2.4.1:
  daemon: unbreak NO_IPV6 build regression
daemon.c