![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200) | ||
| commit | 91743fc0c8785f84f3976d5f5d430b1b3a7d4918 | |
| tree | 15fab925bfc4805bb7c1cc422f2e44178c97545a | tree | snapshot |
| parent | 6f42db1a14f449f99963191f372c61d418bc8a08 | commit | diff |
| parent | beb06e98c5aea9272c5972eee372b42c6abdd2b0 | commit | diff |
Merge branch 'collectd-4.8'
Conflicts:
src/exec.c
Conflicts:
src/exec.c
| configure.in | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.pod | diff1 | | diff2 | | blob | history |
| src/curl.c | diff1 | | diff2 | | blob | history |
| src/exec.c | diff1 | | diff2 | | blob | history |