From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 7 Mar 2012 11:20:14 +0000 (+0100)
Subject: Merge branch 'block-error-warning'
X-Git-Tag: v1.6.11~1^2
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=3587a6299ce95c9cad15a14bc3c2d109a026d74c;p=pazpar2-moved-to-github.git

Merge branch 'block-error-warning'
---

3587a6299ce95c9cad15a14bc3c2d109a026d74c