From: Florian Forster <octo@collectd.org>
Date: Mon, 14 Jan 2013 09:53:13 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.1
X-Git-Tag: collectd-5.2.1~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3427c2e266c04d67848bda913caa730a395c7295;p=thirdparty%2Fcollectd.git

Merge branch 'collectd-4.10' into collectd-5.1
---

3427c2e266c04d67848bda913caa730a395c7295