From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 9 Jul 2010 10:05:32 +0000 (+0200)
Subject: Merge branch 'collectd-4.10'
X-Git-Tag: collectd-5.0.0-beta0~82
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=9a3479d538c92e5a98b14574acd2cc4ee3a3e440;p=collectd.git

Merge branch 'collectd-4.10'
---

9a3479d538c92e5a98b14574acd2cc4ee3a3e440