![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200) | ||
| commit | 7bfda8d327240ac73297e4449663814dd0594be5 | |
| tree | ab963ac2b776414b2fadfed03b5a71a9c2847c1e | tree | snapshot |
| parent | dc2eb041159b967838a2eb658cb256bc846c5264 | commit | diff |
| parent | eae3f57d9a826e015ef952c746675c2aff8592dc | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/daemon/plugin.c | diff1 | | | | blob | history |
| src/network.c | diff1 | | diff2 | | blob | history |