From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 6 Mar 2015 13:13:21 +0000 (+0100)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~7
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=7f0b4d88eca113e5eb0beac2046180e9ff9d08ea;p=pazpar2-moved-to-github.git

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

7f0b4d88eca113e5eb0beac2046180e9ff9d08ea