From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 9 Sep 2014 09:08:41 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~20
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=46b0ea81d4f9b9732dfc139a86342ce36c6038c8;p=pazpar2-moved-to-github.git

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

46b0ea81d4f9b9732dfc139a86342ce36c6038c8