![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 7 Jan 2015 22:32:21 +0000 (23:32 +0100) | ||
| commit | 443afcad2cbacaca9bb1fd7d9ea790cbeb6ff015 | |
| tree | f4ea3e3e9f397b270d0e6580edab95fc13759f45 | tree | snapshot |
| parent | 7e866336a157b26d608337464c387e9aa5494230 | commit | diff |
| parent | 631874e4161f9ac8651158aa81f0e7f8aa896ed9 | commit | diff |
Merge branch 'collectd-4.10' into collectd-5.3
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/types_list.c | diff1 | | diff2 | | blob | history |