![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 10 Jan 2014 14:39:31 +0000 (15:39 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Fri, 10 Jan 2014 14:39:31 +0000 (15:39 +0100) | ||
| commit | ac16c8169106f29d890982cce36bb4cfa7af0429 | |
| tree | 880bb700ecde8733e1d977290e4e52a7d66dd455 | tree | snapshot |
| parent | 4c6303ec6be673df6c9e0964dfc9419c697bf47c | commit | diff |
| parent | 54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a | commit | diff |
Merge branch 'collectd-5.4'
Conflicts:
src/write_graphite.c
Conflicts:
src/write_graphite.c
| configure.ac | | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/curl.c | diff1 | | diff2 | | blob | history |
| src/curl_json.c | diff1 | | diff2 | | blob | history |
| src/curl_xml.c | diff1 | | diff2 | | blob | history |