From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 17 Aug 2010 12:28:32 +0000 (+0200)
Subject: Merge branch 'branch_1_4_4'
X-Git-Tag: v1.5.0~41^2~2
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=e0855b0da3b7037c59cfda82a87318d684d48cf3;p=pazpar2-moved-to-github.git

Merge branch 'branch_1_4_4'
---

e0855b0da3b7037c59cfda82a87318d684d48cf3