![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sun, 28 Feb 2016 00:19:31 +0000 (01:19 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Sun, 28 Feb 2016 00:19:31 +0000 (01:19 +0100) | ||
| commit | f0b5610723ae8962ae264f84210f8bac483bcd20 | |
| tree | 5f2570ffd9b0ec72e61b976200d272ae41040dcd | tree | snapshot |
| parent | 28fa063b625c772f45c99b618f498715fb98474b | commit | diff |
| parent | 6258e772d808f4e76ea8e23d9e2750cfc7e6c60d | commit | diff |
Merge branch '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 |