From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 28 Feb 2009 09:35:04 +0000 (+0100)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.6.2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e419a825c50f9c97471aba7d50521bfc7e19828;p=collectd.git

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

6e419a825c50f9c97471aba7d50521bfc7e19828