From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 4 May 2009 15:12:54 +0000 (+0200)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.7.0~13^2~6
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=218635ab44a8533ef5b23fd1ae78be761ff0600c

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

218635ab44a8533ef5b23fd1ae78be761ff0600c