From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 8 Nov 2008 07:59:17 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.2~13
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=e628f39838a67b40d52dfb8425b4d8474fbd0550

Merge branch 'collectd-4.4' into collectd-4.5
---

e628f39838a67b40d52dfb8425b4d8474fbd0550