From: Florian Forster <octo@noris.net>
Date: Wed, 6 Oct 2010 08:11:10 +0000 (+0200)
Subject: Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
X-Git-Tag: collectd-4.10.2~4
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=72c467f5e8be1a24976d0808a8bdcaa85c6ef9d9

Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
---

72c467f5e8be1a24976d0808a8bdcaa85c6ef9d9