![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 7 Jan 2015 23:17:37 +0000 (00:17 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Wed, 7 Jan 2015 23:17:37 +0000 (00:17 +0100) | ||
| commit | ecbcaadde7dff838f09dfb04c7eb90f126e35abf | |
| tree | 1aa3bb6fc824a328016568892149960460b67615 | tree | snapshot |
| parent | 6c72fa02608cc4be8febc4ae3fec809d281536f8 | commit | diff |
| parent | 443afcad2cbacaca9bb1fd7d9ea790cbeb6ff015 | commit | diff |
Merge branch 'collectd-5.3' into collectd-5.4
| configure.ac | diff1 | | | | blob | history |
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |