From: Florian Forster <octo@collectd.org>
Date: Sat, 6 Aug 2016 19:15:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: collectd-5.6.0~94
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=178bafa2df4f8aed33772af00ebe69f6359c879a;p=collectd.git

Merge remote-tracking branch 'github/master'
---

178bafa2df4f8aed33772af00ebe69f6359c879a