From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 23 Apr 2014 12:45:10 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~26
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=ed8400c109b2a440ed32e78368a554a35411e5b3;hp=ed8400c109b2a440ed32e78368a554a35411e5b3;p=pazpar2-moved-to-github.git

Merge branch 'master' into paz-927

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