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

Merge branch 'master' into channel_list_mutex
---

2ebf0b250fd141b7a3e186e7e99bfc76e29e39d7