Merge branch 'master' into merge/collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 28 Feb 2007 08:08:19 +0000 (09:08 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 28 Feb 2007 08:08:19 +0000 (09:08 +0100)
commit6360474f4aa35dd1a587b6148ff88a23e6155132
tree2b971319dec6dcdc5e6b55167ae1ffe22bec1ce7
parent456c2fdee07c7ef15777537b09d74c6ec650373f
parent0c1205256d8b5096045f5cfe54cae9937c8c7980
Merge branch 'master' into merge/collectd-4

Conflicts:

src/apache.c
configure.in
src/Makefile.am
src/apache.c
src/collectd.conf.in
src/collectd.conf.pod