From: Florian Forster <octo@collectd.org>
Date: Sat, 17 Nov 2012 11:41:00 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.2.0~7^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc0bb2b472628ccede974a02c822d1f9189f0d21;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.10' into collectd-5.0
---

cc0bb2b472628ccede974a02c822d1f9189f0d21