commit bb972f433006efc660a334cc3a1248e7f6211964 Merge: 2845ef5 7501e3f Author: David Goulet dgoulet@ev0ke.net Date: Thu Apr 23 11:50:17 2015 -0400

Merge remote-tracking branch 'yawning/getaddrinfo' into getaddrinfo

src/lib/getaddrinfo.c | 6 ++++++ 1 file changed, 6 insertions(+)