![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sun, 28 Feb 2016 00:12:42 +0000 (01:12 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sun, 28 Feb 2016 00:12:42 +0000 (01:12 +0100) | ||
| commit | 6258e772d808f4e76ea8e23d9e2750cfc7e6c60d | |
| tree | 09108c2179b8f5985e01f8ddb70d07e30adb1622 | tree | snapshot |
| parent | d3f8bb573b981294a614a25fc425f8cf97390275 | commit | diff |
| parent | 8de8814283aa62c1bb29324d9814437da710850f | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| configure.ac | diff1 | | diff2 | | blob | history |
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/processes.c | diff1 | | diff2 | | blob | history |