![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200) | ||
| commit | fbcd49e749c383728f81174280f976ae0d2be2c7 | |
| tree | 247c38a571bc267898d401557541ac9c0e536e0a | tree | snapshot |
| parent | ac73c75aed7c134c6db377a5a306d51e20356fbb | commit | diff |
| parent | 3812f29af0b4ae25d1e0114ee0afc4a83880e913 | commit | diff |
Merge branch 'collectd-5.5'
| README | diff1 | | diff2 | | blob | history |
| configure.ac | diff1 | | diff2 | | blob | history |
| src/daemon/configfile.c | diff1 | | diff2 | | blob | history |