Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)
1  2 
configure.in
src/exec.c

diff --cc configure.in
Simple merge
diff --cc src/exec.c
Simple merge