From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 14 Mar 2009 17:52:58 +0000 (+0100)
Subject: Merge branch 'master' into er/ted
X-Git-Tag: collectd-4.7.0~68^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2c2affa00540642ed087f0f15178eb8cd653fdac;p=collectd.git

Merge branch 'master' into er/ted
---

2c2affa00540642ed087f0f15178eb8cd653fdac