From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 17 Mar 2009 13:51:51 +0000 (+0100)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.6.2~2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=3f391479bfc45d0ff6e0c7b87c899e41a192f392

Merge branch 'collectd-4.5' into collectd-4.6
---

3f391479bfc45d0ff6e0c7b87c899e41a192f392