From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 4 Mar 2016 11:19:47 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~453
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ac3040668e7a9b595edd334a9179a5f6ae42461;p=collectd.git

Merge branch 'collectd-5.5'
---

4ac3040668e7a9b595edd334a9179a5f6ae42461