From: Florian Forster <octo@collectd.org>
Date: Tue, 9 Jun 2015 17:10:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pr/1067'
X-Git-Tag: collectd-5.6.0~696
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=197a3826bcdc731a1a6641ead10c86e7905d3e7a;p=collectd.git

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

197a3826bcdc731a1a6641ead10c86e7905d3e7a