From: Florian Forster <octo@crystal.wlan.home.verplant.org>
Date: Wed, 6 Dec 2006 08:59:20 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-3.11.0~26
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=c8143a8ae616b003001a57c68f3a9b193c390dc8

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

c8143a8ae616b003001a57c68f3a9b193c390dc8