From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 23 Feb 2008 09:48:19 +0000 (+0100)
Subject: Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
X-Git-Tag: collectd-4.2.5~17
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=8ea1756522f94af8e0bb7d06c800d94874f13549;p=collectd.git

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

8ea1756522f94af8e0bb7d06c800d94874f13549