Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:41:57 +0000 (09:41 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:41:57 +0000 (09:41 +0200)
commit7094858f3a32639b3262854815ce7a6efda9901e
tree25b6d280127419e1edd27d44342e7b9ce31cce22
parent0f1fa7a2780b5d03377a4b4e57cba09c83f7b987
parent3951e71cd7c120f0a99a59795ec93de6ef66e428
Merge branch 'master' into paz-927

Conflicts:
src/getaddrinfo.c
src/host.c
src/host.h