Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:20:16 +0000 (16:20 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:20:16 +0000 (16:20 +0200)
Conflicts:
src/openldap.c


No differences found