From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 23 Apr 2014 09:18:54 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~27
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a9350f938e7728f95b15e7f3b704bac9be359d57;p=pazpar2-moved-to-github.git

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

a9350f938e7728f95b15e7f3b704bac9be359d57