From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 4 Nov 2011 13:34:58 +0000 (+0100)
Subject: Merge branch 'master' into bug_4688
X-Git-Tag: v1.6.6~50
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=f0c036628de8084804056af14c6f89990227bdaf;p=pazpar2-moved-to-github.git

Merge branch 'master' into bug_4688
---

f0c036628de8084804056af14c6f89990227bdaf