From: Florian Forster <octo@collectd.org>
Date: Thu, 25 Jun 2015 20:34:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1093'
X-Git-Tag: collectd-5.6.0~670
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=10a3718bdf7761e247b06808b8c72ca75cb0e0ba;p=collectd.git

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

10a3718bdf7761e247b06808b8c72ca75cb0e0ba