Code

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)
commit5ff74d56067ac64db801df5184eb8b97f4b2b645
treec0ecb44b093fe46c90062050910700bb415961d0
parent5ba78cae2b937f5ce50113be3b6f9e96a26dc062
parente56c1e570ff8d4e8fe732f9d74f11217479fdd7b
Merge branch 'collectd-5.7'

Conflicts:
src/openldap.c
src/email.c
src/exec.c
src/openldap.c
src/unixsock.c