From: Florian Forster <octo@collectd.org>
Date: Thu, 11 Jun 2015 13:39:16 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~688
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=13d313acd2c8518fc2967190826305c30c53b76c;p=collectd.git

Merge branch 'collectd-5.5'
---

13d313acd2c8518fc2967190826305c30c53b76c