Merge branch 'collectd-4.0' into collectd-4.1
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 12 Sep 2007 09:15:54 +0000 (11:15 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 12 Sep 2007 09:15:54 +0000 (11:15 +0200)
commit90ac9957e95378d729bce1c00bb0ef2efadab33e
tree9bcc1a2643c434fc3d9fa37c5e73ee13d2e5164c
parent27f6db4769cac5727888c327dbbf1b88da4f3ca6
parentfeb920d8c7311f2f737af03eb7438196ede6ebda
Merge branch 'collectd-4.0' into collectd-4.1

Conflicts:

ChangeLog
configure.in
ChangeLog
src/dns.c
src/ntpd.c
src/plugin.c
src/rrdtool.c
src/unixsock.c