From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 12 Aug 2015 13:43:51 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~6
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=4b259026074c2fb5931eac168a64e8df0be46e30;p=pazpar2-moved-to-github.git

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

4b259026074c2fb5931eac168a64e8df0be46e30