From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 3 Mar 2016 20:36:20 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~455
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6286127470b83578c2889db546cfa32cb0fe0147;p=collectd.git

Merge branch 'collectd-5.5'
---

6286127470b83578c2889db546cfa32cb0fe0147