From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 29 Apr 2010 10:57:21 +0000 (+0200)
Subject: Merge branch 'channel_list_mutex'
X-Git-Tag: v1.4.0~3
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=2ed4c51884e38473e3cc85e2a185dfe5d44fa22b;p=pazpar2-moved-to-github.git

Merge branch 'channel_list_mutex'
---

2ed4c51884e38473e3cc85e2a185dfe5d44fa22b