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

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

23cc5fcaf271b065994c8daa2b362ef1c4f59fba