Merge branch 'jc/daemon-no-ipv6-for-2.4.1'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:53 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:53 +0000 (14:23 -0700)
"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

1  2 
daemon.c
diff --cc daemon.c
Simple merge