From: Florian Forster <octo@collectd.org>
Date: Tue, 1 Dec 2015 20:33:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1336' into collectd-5.5
X-Git-Tag: collectd-5.5.1~37
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=4c30f47794046ec7c8dfb5e1d41d03633032bac7;p=collectd.git

Merge remote-tracking branch 'github/pr/1336' into collectd-5.5
---

4c30f47794046ec7c8dfb5e1d41d03633032bac7