From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 13 Apr 2008 09:12:22 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
X-Git-Tag: collectd-4.2.7~7
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=0b4c21d702c278b1e5d8b7b3d334a0b6d4831edc;p=collectd.git

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

0b4c21d702c278b1e5d8b7b3d334a0b6d4831edc