From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 20 Sep 2012 10:56:30 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.20~7
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=2da3b258a6728d711eb4b78b262e4a14ec74ca3c;p=pazpar2-moved-to-github.git

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

2da3b258a6728d711eb4b78b262e4a14ec74ca3c