From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 8 Nov 2011 11:09:13 +0000 (+0100)
Subject: Merge branch 'master' into bug_4688
X-Git-Tag: v1.6.6~45
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=a76aa7a25380bb9947d8dfed2aca94832f47d564;p=pazpar2-moved-to-github.git

Merge branch 'master' into bug_4688
---

a76aa7a25380bb9947d8dfed2aca94832f47d564