From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 20 Jun 2009 10:51:45 +0000 (+0200)
Subject: Merge branch 'collectd-4.6' into collectd-4.7
X-Git-Tag: collectd-4.7.2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=658e44d47088aaea3c59fb248336a74fdefe4245;p=collectd.git

Merge branch 'collectd-4.6' into collectd-4.7
---

658e44d47088aaea3c59fb248336a74fdefe4245