From: Florian Forster <octo@collectd.org>
Date: Wed, 9 Dec 2015 08:54:09 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~507
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=928e57746b4f67981318b7a4161a3ddd54d2b1a3

Merge branch 'collectd-5.5'
---

928e57746b4f67981318b7a4161a3ddd54d2b1a3