From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 15 Dec 2007 11:11:17 +0000 (+0100)
Subject: Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
X-Git-Tag: collectd-4.3.0beta0~62
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=79dab1613955126520ab36e772f0afb596fd51dc;p=collectd.git

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

79dab1613955126520ab36e772f0afb596fd51dc