From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 6 Mar 2015 10:17:31 +0000 (+0100)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~10
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=294559ec552ed9b086d52984cdee74384ee6c34b;p=pazpar2-moved-to-github.git

Merge branch 'master' into paz-927
---

294559ec552ed9b086d52984cdee74384ee6c34b