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

Merge branch 'collectd-5.5'
---

d143bc65a6984281b7c757fd5ea6ef27af5681bb