From: Florian Forster <octo@noris.net>
Date: Wed, 13 Jan 2010 11:10:20 +0000 (+0100)
Subject: Merge branch 'collectd-4.7' into collectd-4.8
X-Git-Tag: collectd-4.8.3~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8be9c73cc216609a54a1b997aad8a3d646a0a43f;p=collectd.git

Merge branch 'collectd-4.7' into collectd-4.8
---

8be9c73cc216609a54a1b997aad8a3d646a0a43f