From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 7 Feb 2011 07:47:44 +0000 (+0100)
Subject: Merge branch 'collectd-5.0'
X-Git-Tag: collectd-5.1.0~75
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=738d9489468b71d867ac32c9ac7b2ba29e87a39c;p=collectd.git

Merge branch 'collectd-5.0'
---

738d9489468b71d867ac32c9ac7b2ba29e87a39c