From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 25 Mar 2011 11:29:19 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.5~7
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=c4a6f1dd0af3b7f9bd842b12eead7ed37a85b10a;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
---

c4a6f1dd0af3b7f9bd842b12eead7ed37a85b10a