From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 4 Jun 2010 10:41:19 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.4.2~7^2~28
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=fb03f9828f430b48d77119d126867b6b4946dc48;p=pazpar2-moved-to-github.git

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

fb03f9828f430b48d77119d126867b6b4946dc48