From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 27 Apr 2010 09:01:49 +0000 (+0200)
Subject: Merge branch 'master' into channel_list_mutex
X-Git-Tag: v1.4.0~3^2~14
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=e6d6362b750ae25591ee5a40e135878fd590e13e;p=pazpar2-moved-to-github.git

Merge branch 'master' into channel_list_mutex
---

e6d6362b750ae25591ee5a40e135878fd590e13e