Merge branch 'jc/daemon-no-ipv6-for-2.4.1'
commit9e4d2f6d45ef46e5774bbf752786ca3b9a4142a5
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:53 +0000 (11 14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:53 +0000 (11 14:23 -0700)
treeda420b5c0f146d8420c5e1ddf4e77e023fbba50f
parenta0c0c2e5c29f54c69fa6735aca6ed3079f5f4190
parentd358f771e3a0e78ea8ebed7edf48a12a7620c813
Merge branch 'jc/daemon-no-ipv6-for-2.4.1'

"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