From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 9 Feb 2008 16:46:48 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.3.0beta1~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d0b7e88ee93371c25241f6a1fed3b4918087bb0c;p=collectd.git

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

d0b7e88ee93371c25241f6a1fed3b4918087bb0c