From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 17 Dec 2014 13:03:32 +0000 (+0100)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~13
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=cea5d06318c86c9652cad5c4fefa39fa2e9745ac;p=pazpar2-moved-to-github.git

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

cea5d06318c86c9652cad5c4fefa39fa2e9745ac