Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Sep 2009 20:18:24 +0000 (22:18 +0200)
commit91743fc0c8785f84f3976d5f5d430b1b3a7d4918
tree15fab925bfc4805bb7c1cc422f2e44178c97545a
parent6f42db1a14f449f99963191f372c61d418bc8a08
parentbeb06e98c5aea9272c5972eee372b42c6abdd2b0
Merge branch 'collectd-4.8'

Conflicts:
src/exec.c
configure.in
src/Makefile.am
src/collectd.conf.pod
src/curl.c
src/exec.c