Code

Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 17:12:00 +0000 (19:12 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 17:12:00 +0000 (19:12 +0200)
1  2 
configure.in
src/processes.c

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