From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 3 Oct 2008 21:18:28 +0000 (+0200)
Subject: Merge branch 'collectd-4.5'
X-Git-Tag: collectd-4.6.0~190
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=011068c93883652d9729a26e0157e94811952609;p=collectd.git

Merge branch 'collectd-4.5'
---

011068c93883652d9729a26e0157e94811952609