Merge branch 'channel_list_mutex'
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 29 Apr 2010 10:57:21 +0000 (12:57 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 29 Apr 2010 10:57:21 +0000 (12:57 +0200)
commit2ed4c51884e38473e3cc85e2a185dfe5d44fa22b
treedd563ec21631af51b36d219856f787fa90d44308
parent92580490f85b0ae0a08c1bcec574de4ea886d843
parent682faf92e6963c1b70a3b16da9bf34373cc7a4be
Merge branch 'channel_list_mutex'