![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 20 May 2016 10:50:02 +0000 (12:50 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 20 May 2016 10:50:02 +0000 (12:50 +0200) | ||
| commit | b286b677bb54a3192a4121c2aa0857a133fd0603 | |
| tree | ada9fcf22543e82f8bd9c88917e82e0868657f66 | tree | snapshot |
| parent | 56536633afb68ded68ac7bd012060cb9337fbcc5 | commit | diff |
| parent | fcccdd28cd71d982421c72f306d106928d6c5fbd | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/daemon/utils_cache.c | diff1 | | | | blob | history |
| src/exec.c | diff1 | | diff2 | | blob | history |