From: Florian Forster <octo@collectd.org>
Date: Fri, 28 Oct 2016 05:25:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/pr/2006'
X-Git-Tag: collectd-5.7.0~44
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5aa9bb0e92c0540eb83f71bc9ed555d4363624c6;hp=-c;p=collectd.git

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

5aa9bb0e92c0540eb83f71bc9ed555d4363624c6