From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 19 Jul 2009 15:39:06 +0000 (+0200)
Subject: Merge branch 'collectd-4.7'
X-Git-Tag: collectd-4.8.0~73
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=35f98b6e5c4c30bd7aeb52c7894c5f6e276638da

Merge branch 'collectd-4.7'
---

35f98b6e5c4c30bd7aeb52c7894c5f6e276638da