From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 21 Aug 2012 13:24:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: v1.6.16~3^2~4
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=6b86af5db49a421480705a262ce56be54d12d1ab;p=pazpar2-moved-to-github.git

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

6b86af5db49a421480705a262ce56be54d12d1ab