From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 12 Apr 2011 11:35:37 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.5.6~3
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=33a82a3757dd648d3515834592fb68c53269c72f;p=pazpar2-moved-to-github.git

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

33a82a3757dd648d3515834592fb68c53269c72f