From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 30 Jun 2017 14:20:16 +0000 (+0200)
Subject: Merge branch 'collectd-5.7'
X-Git-Tag: collectd-5.8.0~145
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5ff74d56067ac64db801df5184eb8b97f4b2b645;hp=5ff74d56067ac64db801df5184eb8b97f4b2b645;p=collectd.git

Merge branch 'collectd-5.7'

Conflicts:
	src/openldap.c
---