From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 1 May 2009 14:34:51 +0000 (+0200)
Subject: Merge branch 'collectd-4.5' into collectd-4.6
X-Git-Tag: collectd-4.7.0~13^2~10
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=52f41fed6e32f66f5817a82ae175fd443084f8a3;p=collectd.git

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

52f41fed6e32f66f5817a82ae175fd443084f8a3