From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 3 Jun 2016 10:56:53 +0000 (+0200)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~289
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6600bd1351bf81e0831e7ad95ee37a7b28cbdf94;p=collectd.git

Merge branch 'collectd-5.5'

Conflicts:
	src/perl.c
---

6600bd1351bf81e0831e7ad95ee37a7b28cbdf94