From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 5 Sep 2014 11:52:51 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~22
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=e9e5603afa14e52f004d64211345f1c3ab17a6a3;hp=e9e5603afa14e52f004d64211345f1c3ab17a6a3;p=pazpar2-moved-to-github.git

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