From: Florian Forster <octo@collectd.org>
Date: Fri, 4 Dec 2015 15:39:30 +0000 (+0100)
Subject: Merge branch 'pr/1395'
X-Git-Tag: collectd-5.6.0~528
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;ds=sidebyside;h=e96afedbc67f8a508e37b73217c224aa5bd25f66;p=collectd.git

Merge branch 'pr/1395'
---

e96afedbc67f8a508e37b73217c224aa5bd25f66