From: Sebastian Hammer <quinn@dart.(none)>
Date: Tue, 1 Jun 2010 01:53:17 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git/home/git/pub/pazpar2
X-Git-Tag: v1.4.2~7^2~28^2~2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=1d225e7e0442336c27419df7be71ed7f0b237d9c;p=pazpar2-moved-to-github.git

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

1d225e7e0442336c27419df7be71ed7f0b237d9c