![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 30 Jun 2017 14:20:16 +0000 (16:20 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 30 Jun 2017 14:20:16 +0000 (16:20 +0200) | ||
| commit | 5ff74d56067ac64db801df5184eb8b97f4b2b645 | |
| tree | c0ecb44b093fe46c90062050910700bb415961d0 | tree | snapshot |
| parent | 5ba78cae2b937f5ce50113be3b6f9e96a26dc062 | commit | diff |
| parent | e56c1e570ff8d4e8fe732f9d74f11217479fdd7b | commit | diff |
Merge branch 'collectd-5.7'
Conflicts:
src/openldap.c
Conflicts:
src/openldap.c
| src/email.c | diff1 | | diff2 | | blob | history |
| src/exec.c | diff1 | | diff2 | | blob | history |
| src/openldap.c | diff1 | | diff2 | | blob | history |
| src/unixsock.c | diff1 | | diff2 | | blob | history |