From: Florian Forster <octo@huhu.verplant.org>
Date: Fri, 9 Feb 2007 16:55:49 +0000 (+0100)
Subject: Merge branch 'pull/collectd-3.11' into collectd-3.11
X-Git-Tag: collectd-3.11.1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=042117ae46d0731898d33871a5fa24a8d82c2861;p=collectd.git

Merge branch 'pull/collectd-3.11' into collectd-3.11
---

042117ae46d0731898d33871a5fa24a8d82c2861