From: Florian Forster <octo@collectd.org>
Date: Wed, 17 Jun 2015 12:53:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1087'
X-Git-Tag: collectd-5.6.0~680
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=22b1f30eb1bb53e2b6c7fc8d917f222cfc16bae3;p=collectd.git

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

22b1f30eb1bb53e2b6c7fc8d917f222cfc16bae3