From: Florian Forster <octo@collectd.org>
Date: Tue, 19 May 2015 08:45:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1027'
X-Git-Tag: collectd-5.5.0~27
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=55ebefc8321c4a1c54492bdec8a972426758c658

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

55ebefc8321c4a1c54492bdec8a972426758c658