![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 7 Jul 2015 22:35:27 +0000 (00:35 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 7 Jul 2015 22:35:27 +0000 (00:35 +0200) | ||
| commit | 872126c9a7e0a8f8ae2b28217c12c27c35af5237 | |
| tree | e48c2f37bf1bf9ed1c0020938a2300f75b53b856 | tree | snapshot |
| parent | 9bd400b6073c7ad4e3ba4b6f568fd7f608a4b02f | commit | diff |
| parent | 24c2f247f6dc5c17b26d715346a380efababb08f | commit | diff |
Merge branch 'collectd-5.5'
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/daemon/Makefile.am | diff1 | | diff2 | | blob | history |