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

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

a5c3dee6eb34da90683db5ac0b0e4e876627496b