From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 2 Jun 2010 12:53:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.4.2~7^2~32
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=232e1f271f1a9fab3888a5953f7e07ba691775c1;p=pazpar2-moved-to-github.git

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

232e1f271f1a9fab3888a5953f7e07ba691775c1