Code

Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 25 Feb 2010 22:55:25 +0000 (23:55 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 25 Feb 2010 22:55:25 +0000 (23:55 +0100)
commit3bd6fcdfd20002eee1f1803460728449c0c98f86
tree84408aeba132da90a60061f6c81fcb935d369b3a
parentc253952ba26a4123aade567d590ff206f84ec82f
parentd3dbc7f5429ff928ed616beb8574f081235ef85b
Merge branch 'collectd-4.8' into collectd-4.9

Conflicts:

src/ping.c
configure.in
src/apache.c
src/collectd.conf.in
src/collectd.conf.pod
src/exec.c
src/ping.c
src/plugin.c