Code

Merge branch 'master' into collectd-4
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 15 May 2007 17:27:31 +0000 (19:27 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 15 May 2007 17:27:31 +0000 (19:27 +0200)
commit44e4d530c8db2e078cd73ab254d1be41a5f2812c
tree3f09caae1c3b13b298f5a5805986fc923ef6a9df
parent42c56b58e385b7a45ab0d2287a4042e53ae22c07
parent3a4405009e53f578c26c22073920cc5b4ffa6eca
Merge branch 'master' into collectd-4

Conflicts:

src/multimeter.c
src/network.c
src/utils_debug.c
configure.in
src/collectd.h
src/common.c
src/utils_ignorelist.c
src/utils_mount.c