Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 12:45:10 +0000 (14:45 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 23 Apr 2014 12:45:10 +0000 (14:45 +0200)
commited8400c109b2a440ed32e78368a554a35411e5b3
tree27f2ff6bf9fecab63e6faa047708b57a0bc40f31
parenta9350f938e7728f95b15e7f3b704bac9be359d57
parent18f2ca94b3cfb8f77ab8444b5afa1479abd00308
Merge branch 'master' into paz-927

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