From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 23 Apr 2014 09:16:07 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~28
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=e2e42808d8ea15688b8a6cc3bd1b0f77d915b995;p=pazpar2-moved-to-github.git

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

e2e42808d8ea15688b8a6cc3bd1b0f77d915b995