From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 26 Aug 2007 17:07:46 +0000 (+0200)
Subject: Merge branch 'collectd-3.11' into collectd-4.0
X-Git-Tag: collectd-4.0.7~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=14b7c735bf93b5a6260a0e064bccc28dc7581c7f;p=collectd.git

Merge branch 'collectd-3.11' into collectd-4.0
---

14b7c735bf93b5a6260a0e064bccc28dc7581c7f