From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 11 May 2009 14:18:22 +0000 (+0200)
Subject: Merge remote branch 'tokkee/sh/collectd-4.7' into collectd-4.7
X-Git-Tag: collectd-4.7.0~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=568006186417f6b2404790969599f4cd0d2eee22;p=collectd.git

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

568006186417f6b2404790969599f4cd0d2eee22