From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 18 Feb 2008 17:30:10 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.3.0~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7284486320eb036e9d4e60d2e68f4b05421ee785;hp=-c;p=collectd.git

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

7284486320eb036e9d4e60d2e68f4b05421ee785