Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint
commit6fd58363a4fa5f99c7d764e34e8be1b7044d7252
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:49:19 +0000 (26 13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2015 20:49:19 +0000 (26 13:49 -0700)
treef3d59359148052df668c546780253de42ca3e362
parentcb9ec8e23e6aee90f80635fdaaed919fe2c7d675
parentd358f771e3a0e78ea8ebed7edf48a12a7620c813
Merge branch 'jc/daemon-no-ipv6-for-2.4.1' into maint

"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