From: Florian Forster <octo@noris.net>
Date: Fri, 28 Nov 2008 11:00:03 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.5.2~12
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=68ab7da7a51018a00e6e03347182b988a30296a7;p=collectd.git

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

68ab7da7a51018a00e6e03347182b988a30296a7