Merge branch 'channel_list_mutex' of ssh://git.indexdata.com/home/git/pub/pazpar2...
authorDennis Schafroth <dennis@indexdata.com>
Wed, 28 Apr 2010 14:07:38 +0000 (16:07 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 28 Apr 2010 14:07:38 +0000 (16:07 +0200)

Trivial merge