From: Florian Forster <octo@collectd.org>
Date: Tue, 2 Sep 2014 17:51:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
X-Git-Tag: collectd-5.3.2~44
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=eb342c120baa5d015d71ae8ec8fba490df88ee64;p=collectd.git

Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
---

eb342c120baa5d015d71ae8ec8fba490df88ee64