From: Florian Forster <octo@collectd.org>
Date: Sat, 6 Jun 2015 19:39:16 +0000 (+0200)
Subject: Merge branch 'pr/1033'
X-Git-Tag: collectd-5.6.0~704
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3f9f6b9bc37cfd8ee3eb7a21cb895ff524c533c8;p=collectd.git

Merge branch 'pr/1033'
---

3f9f6b9bc37cfd8ee3eb7a21cb895ff524c533c8