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)
commite56c1e570ff8d4e8fe732f9d74f11217479fdd7b
tree7706aacf679570c387ed211bdfbc95f560b9dbd2
parent441863935479a66e46757477bc9af3f664a77c99
parent24bdf52decaf93359aab0364fb11420af5cd4a21
Merge branch 'collectd-5.6' into collectd-5.7
src/email.c
src/exec.c
src/openldap.c
src/unixsock.c