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

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

a8767b7f9a59905fbb94ddbdf1848d629db3bb62