From: Florian Forster <octo@collectd.org>
Date: Thu, 25 Jun 2015 20:37:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/1097'
X-Git-Tag: collectd-5.6.0~669
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=88f22ff8b4c69eb38b6aaab30df212df1871d4ec;p=collectd.git

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

88f22ff8b4c69eb38b6aaab30df212df1871d4ec