From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 2 Aug 2009 10:22:20 +0000 (+0200)
Subject: Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6
X-Git-Tag: collectd-4.6.5~29
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=38469fd7bce3b64857c711169c6289f16d8f0114;p=collectd.git

Merge remote branch 'tokkee/sh/collectd-4.6' into collectd-4.6
---

38469fd7bce3b64857c711169c6289f16d8f0114