From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 8 Nov 2008 15:03:04 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.6.0~160
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b3f9a3808f0919dabaa17707c7c4f5ed75df99cc;p=collectd.git

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

b3f9a3808f0919dabaa17707c7c4f5ed75df99cc