From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 29 Nov 2016 11:31:39 +0000 (+0100)
Subject: Merge branch 'collectd-5.5' into collectd-5.6
X-Git-Tag: collectd-5.6.2~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2079ee1517e34de372f58e7e2267ad5c71a8a41f;hp=8f5d58fe121bc25d6ba34346a58d922488ed181b

Merge branch 'collectd-5.5' into collectd-5.6

Conflicts:
	contrib/redhat/collectd.spec
---