From: Florian Forster <octo@collectd.org>
Date: Thu, 18 Oct 2012 10:49:39 +0000 (+0200)
Subject: Merge branch 'collectd-5.0' into collectd-5.1
X-Git-Tag: collectd-5.1.1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a60550f0b85d413957654546a87f00a95e59a26c;p=collectd.git

Merge branch 'collectd-5.0' into collectd-5.1
---

a60550f0b85d413957654546a87f00a95e59a26c