From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 27 May 2008 15:52:36 +0000 (+0200)
Subject: Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
X-Git-Tag: collectd-4.4.1~5
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=b9f818d0e8f2ce608e491f0ee0ba4024a2694101

Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
---

b9f818d0e8f2ce608e491f0ee0ba4024a2694101