From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 3 Mar 2014 15:06:09 +0000 (+0100)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~35
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=a1d681acf3128607a4945ca2d85dbbb0bb9f76ba;p=pazpar2-moved-to-github.git

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

a1d681acf3128607a4945ca2d85dbbb0bb9f76ba