From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 21:06:46 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~521
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=40aabf444e124f40603021821e98bcc40c4aaa0e;p=collectd.git

Merge branch 'collectd-5.5'
---

40aabf444e124f40603021821e98bcc40c4aaa0e