From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 19 Aug 2014 07:41:57 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~23
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=7094858f3a32639b3262854815ce7a6efda9901e;p=pazpar2-moved-to-github.git

Merge branch 'master' into paz-927

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

7094858f3a32639b3262854815ce7a6efda9901e