Merge branch 'ep/ident-with-getaddrinfo' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:42:01 +0000 (09:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Dec 2015 17:42:01 +0000 (09:42 -0800)
A fix-up for recent topic.

* ep/ident-with-getaddrinfo:
  ident: fix undefined variable when NO_IPV6 is set
  ident.c: add support for IPv6


Trivial merge