From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 7 Mar 2014 12:28:50 +0000 (+0100)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~31
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=89234559660e1b54c00df190b405c87d7335ae44;p=pazpar2-moved-to-github.git

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

89234559660e1b54c00df190b405c87d7335ae44