From: Florian Forster <octo@collectd.org>
Date: Wed, 2 Dec 2015 09:49:36 +0000 (+0100)
Subject: Merge branch 'ff/statsd'
X-Git-Tag: collectd-5.6.0~534
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=306810f293c3bc1f3cbf2793a228d2113500e573;p=collectd.git

Merge branch 'ff/statsd'
---

306810f293c3bc1f3cbf2793a228d2113500e573