From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 10 May 2016 09:53:28 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~299
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=aef15b632b9f415e5ebfadd4e41fa8a3c19407ee;p=collectd.git

Merge branch 'collectd-5.5'
---

aef15b632b9f415e5ebfadd4e41fa8a3c19407ee