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)
commitde301c5c85b333751a21b3d6b8cff566dc31e6c9
tree05be77a4c0a57220506738d04d03699e2c7f76f4
parentf97f2e5c645759ec3204ca99cbc5f61caf9201de
parent58d29ececf8fc287d9b244c617edd174ded66b01
Merge branch 'ep/ident-with-getaddrinfo' into maint

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