![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 4 Mar 2016 11:19:15 +0000 (12:19 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 4 Mar 2016 11:19:15 +0000 (12:19 +0100) | ||
| commit | 1fc00932fd49fa535551cc4bba09c4e4be059ab4 | |
| tree | 701daafab146a627665016acfe79fcaff9c705ee | tree | snapshot |
| parent | 9de86bc9ce5961281632944a04efbc2314828a2f | commit | diff |
| parent | f8379dd45f4a43595f4027992696ee8d02908bff | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/daemon/plugin.c | diff1 | | | | blob | history |
| src/processes.c | diff1 | | diff2 | | blob | history |
| src/python.c | diff1 | | diff2 | | blob | history |
| src/tokyotyrant.c | diff1 | | diff2 | | blob | history |