From: Florian Forster <octo@collectd.org>
Date: Tue, 19 May 2015 15:40:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1009'
X-Git-Tag: collectd-5.5.0~22
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0c88d3b2d330c152be0bc6af8faecef0211a705e;p=collectd.git

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

0c88d3b2d330c152be0bc6af8faecef0211a705e