From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 8 Nov 2008 08:01:12 +0000 (+0100)
Subject: Merge branch 'sh/next'
X-Git-Tag: collectd-4.6.0~162
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=03576db7496264c5e7054e6cc765db0beea4a0da;p=collectd.git

Merge branch 'sh/next'
---

03576db7496264c5e7054e6cc765db0beea4a0da