From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 3 Nov 2011 12:51:20 +0000 (+0100)
Subject: Merge branch 'master' into bug_4688
X-Git-Tag: v1.6.6~54
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=158c725b0201be796e73338f8c8b529379912ad6;p=pazpar2-moved-to-github.git

Merge branch 'master' into bug_4688
---

158c725b0201be796e73338f8c8b529379912ad6