From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 31 Aug 2007 14:10:33 +0000 (+0200)
Subject: Merge branch 'collectd-4.0'
X-Git-Tag: collectd-4.1.0~12^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=7c6b8505e5557622158574c8dce8ba53c53cec72

Merge branch 'collectd-4.0'
---

7c6b8505e5557622158574c8dce8ba53c53cec72