From: Florian Forster <octo@collectd.org>
Date: Thu, 21 Aug 2014 05:47:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/711'
X-Git-Tag: collectd-5.5.0~220
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=39771ec2af4559a62bda2c469a2501c6023f551e;p=collectd.git

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

39771ec2af4559a62bda2c469a2501c6023f551e