From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 11 Sep 2014 12:12:58 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~15
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=2c9d7370a80943384fa385a8e78ccfad274ba1c7;p=pazpar2-moved-to-github.git

Merge branch 'master' into paz-927

Conflicts:
	src/connection.c
---

2c9d7370a80943384fa385a8e78ccfad274ba1c7