From: Florian Forster <octo@huhu.verplant.org>
Date: Tue, 17 Mar 2009 08:29:06 +0000 (+0100)
Subject: Merge branch 'collectd-4.6' of /var/lib/git/collectd into collectd-4.6
X-Git-Tag: collectd-4.6.2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ec2d5e1b7df6353aa926e0f77477830f3984cf7b;p=collectd.git

Merge branch 'collectd-4.6' of /var/lib/git/collectd into collectd-4.6
---

ec2d5e1b7df6353aa926e0f77477830f3984cf7b