From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 4 Oct 2012 15:48:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.22~5^2~3
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=807b9e8c982328726ec331cdb1eb19163bf8bba6;p=pazpar2-moved-to-github.git

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

807b9e8c982328726ec331cdb1eb19163bf8bba6