From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Thu, 5 Feb 2009 21:54:40 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.6.0~53
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=56159e13f4b983a2e8c846b39ca96b2384ec746a

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

56159e13f4b983a2e8c846b39ca96b2384ec746a