Code

Merge branch 'collectd-5.6' into collectd-5.7
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:17:06 +0000 (16:17 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:17:06 +0000 (16:17 +0200)
1  2 
src/email.c
src/exec.c
src/openldap.c
src/unixsock.c

diff --cc src/email.c
Simple merge
diff --cc src/exec.c
Simple merge
diff --cc src/openldap.c
Simple merge
diff --cc src/unixsock.c
Simple merge