Merge branch 'master' into ff/plugins-ng
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 13 Jan 2007 15:47:15 +0000 (16:47 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 13 Jan 2007 15:47:15 +0000 (16:47 +0100)
commitf179018be96e1e1aea25d4928bdaf100a9a92a7d
tree90fea9426803afbf9367de900d8e08a80d70932f
parentbaa11df8e1107079d22de78a8104332e1cc7cc5c
parent0d402ede02f94bf48dc84962c5f17a2b61cabcc3
Merge branch 'master' into ff/plugins-ng

Conflicts:

src/collectd.c
src/network.c
configure.in
src/Makefile.am
src/collectd.c
src/collectd.h
src/network.c