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

Merge branch 'master' into channel_list_mutex
---

649a9d45b919c376ddcbb89e0d34c4efeeb29fb9