From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 25 Nov 2010 10:51:17 +0000 (+0100)
Subject: Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
X-Git-Tag: collectd-4.9.4~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=613f5b8a4a3ec711b29928ba78ab7d318ff169fc;p=collectd.git

Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
---

613f5b8a4a3ec711b29928ba78ab7d318ff169fc