From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 28 Mar 2011 08:57:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.5~4
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=5d7214f79a8cd1b8c8e71453d670fb58eb180d34;p=pazpar2-moved-to-github.git

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

5d7214f79a8cd1b8c8e71453d670fb58eb180d34