From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 10 Sep 2014 07:39:27 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~18
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=46dcd19fea52e19dcb5b1d2341241e9a8819c73e;p=pazpar2-moved-to-github.git

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

46dcd19fea52e19dcb5b1d2341241e9a8819c73e