From: Florian Forster <octo@collectd.org>
Date: Thu, 25 Jun 2015 19:40:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1082'
X-Git-Tag: collectd-5.6.0~672
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b914b8bf2c6580fd78836399e0aaa851eb4883c5;p=collectd.git

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

b914b8bf2c6580fd78836399e0aaa851eb4883c5