![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 10 Jan 2017 22:01:43 +0000 (23:01 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 10 Jan 2017 22:01:43 +0000 (23:01 +0100) | ||
| commit | e37e426d6646d6ff99834461f00c3dd79fa85d43 | |
| tree | db5eda5ee02204832a0418e28cf0af073a2c09c0 | tree | snapshot |
| parent | d3be3ed7cb69be4a9a256449d4885d4a55399de0 | commit | diff |
| parent | 3d964c1be299eb1a078051e913478c2767ffe946 | commit | diff |
Merge branch 'collectd-5.6' into collectd-5.7
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |