From: Dennis Schafroth <dennis@indexdata.com>
Date: Wed, 7 Mar 2012 09:59:43 +0000 (+0100)
Subject: Merge branch 'master' into block-error-warning
X-Git-Tag: v1.6.11~1^2^2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=7522c8b0bbd2f4dfd17dbd336c19c6bd36f151e2;p=pazpar2-moved-to-github.git

Merge branch 'master' into block-error-warning

Fix conflicts:
	test/test_termlist_block_10.res
	test/test_termlist_block_5.res
---

7522c8b0bbd2f4dfd17dbd336c19c6bd36f151e2