![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 24 Feb 2015 09:02:58 +0000 (10:02 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 24 Feb 2015 09:02:58 +0000 (10:02 +0100) | ||
| commit | dd8429c16bc57f949abb2537e003b76ad88b6f90 | |
| tree | 15eab90f255ca3bd454e4f7cd764d64a7ecb6cbf | tree | snapshot |
| parent | fd3acd001229e60a0bb34dead326d3dc003ab1fd | commit | diff |
| parent | 587f01f89af11c4acebbec44293528b77c779218 | commit | diff |
Merge branch 'collectd-5.4'
Conflicts:
src/Makefile.am
src/write_http.c
Conflicts:
src/Makefile.am
src/write_http.c
| contrib/redhat/collectd.spec | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |