From: Florian Forster <octo@collectd.org>
Date: Tue, 8 Dec 2015 09:44:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1437'
X-Git-Tag: collectd-5.6.0~510
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b333eb9557c96bdd2a336c33d623e428922a1046;p=collectd.git

Merge remote-tracking branch 'github/pr/1437'
---

b333eb9557c96bdd2a336c33d623e428922a1046