Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100)
commit9988d61c84dfff5d04ddf48f4b93f6c9449cdc41
treebaec76cd90c857d1beea4dc45c6e712c0663127c
parent3bd6fcdfd20002eee1f1803460728449c0c98f86
parent40783e8982dd86f65dcf67df44992097719a995b
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:
src/exec.c
configure.in
src/common.c
src/common.h
src/configfile.c
src/exec.c
src/processes.c