From: Florian Forster <octo@collectd.org>
Date: Sun, 14 Aug 2016 19:03:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Tag: collectd-5.6.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6120d0461a933cdbb8a6e495c6b6e8750c8aaf05;p=thirdparty%2Fcollectd.git

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

6120d0461a933cdbb8a6e495c6b6e8750c8aaf05