![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 5 Aug 2016 11:17:32 +0000 (13:17 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 5 Aug 2016 11:17:32 +0000 (13:17 +0200) | ||
| commit | 958f7776a2daaa1a8664aded0a2c1d717c2f5909 | |
| tree | 28395142ae7b4c45cfa331e7926fd8dadd790d38 | tree | snapshot |
| parent | 42c129f80a181553ac08b6e8d3484a845c674a07 | commit | diff |
| parent | 7bfda8d327240ac73297e4449663814dd0594be5 | commit | diff |
Merge branch 'collectd-5.5'
Conflicts:
src/pyvalues.c
Conflicts:
src/pyvalues.c
| src/daemon/plugin.c | diff1 | | diff2 | | blob | history |
| src/network.c | diff1 | | diff2 | | blob | history |
| src/pyvalues.c | diff1 | | diff2 | | blob | history |