From: Florian Forster <octo@collectd.org>
Date: Thu, 17 Dec 2015 09:09:28 +0000 (+0100)
Subject: Merge branch 'pr/1469'
X-Git-Tag: collectd-5.6.0~488
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=05ec6a8938ab154b3572cb7bfe7204b00c989575;p=collectd.git

Merge branch 'pr/1469'
---

05ec6a8938ab154b3572cb7bfe7204b00c989575