From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 3 Oct 2008 11:35:45 +0000 (+0200)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.1~10
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=39ba035b60b509311874ccf89d11d240c0271a90

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

39ba035b60b509311874ccf89d11d240c0271a90