From: Florian Forster <octo@collectd.org>
Date: Tue, 8 Dec 2015 08:24:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1438'
X-Git-Tag: collectd-5.6.0~514
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=75323bd2ca5e0fdb8d93b34e7d9b8effac972697;p=collectd.git

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

75323bd2ca5e0fdb8d93b34e7d9b8effac972697