From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 16 Feb 2009 21:56:37 +0000 (+0100)
Subject: Merge branch 'sh/next'
X-Git-Tag: collectd-4.6.0^0
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2084476fec843de625cc59c86d43b43b7fb88fd9;p=collectd.git

Merge branch 'sh/next'
---

2084476fec843de625cc59c86d43b43b7fb88fd9