From: Florian Forster <octo@collectd.org>
Date: Mon, 1 Jun 2015 17:15:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1056'
X-Git-Tag: collectd-5.6.0~706
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=741e018fff531bfe914781489d9b2c7a002f2bc7

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

741e018fff531bfe914781489d9b2c7a002f2bc7