From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 10 Nov 2011 11:41:25 +0000 (+0100)
Subject: Merge branch 'master' into bug_4688
X-Git-Tag: v1.6.6~39
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=a7effcffcc6631653bf2fd53bcad1e12355d737a;p=pazpar2-moved-to-github.git

Merge branch 'master' into bug_4688
---

a7effcffcc6631653bf2fd53bcad1e12355d737a