![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 11 Dec 2015 20:56:40 +0000 (21:56 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 11 Dec 2015 20:56:40 +0000 (21:56 +0100) | ||
| commit | 59547eb66a3743ca0b458222d7a4318f3e659a60 | |
| tree | d4927201e8eb48cbfafaf946fc88719ba6c5c98d | tree | snapshot |
| parent | 0657d95eaa686d64efe6bbccda346ebd6467bd0b | commit | diff |
| parent | 9fd3d670c4e85d840e618647c15b64d728a3f193 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/daemon/utils_ignorelist.c | diff1 | | | | blob | history |
| src/swap.c | diff1 | | diff2 | | blob | history |