Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@noris.net>
Tue, 1 Apr 2008 13:05:45 +0000 (15:05 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 1 Apr 2008 13:05:45 +0000 (15:05 +0200)
commit4fb5d4b471e3f6a24d7cd36272e48e57bcb2c68f
treecb938d3d5344bf65462baeffe9edd634246e27f3
parenta962cc65ed7e9fd1c26ee5f4172d3d0b82c8ec5f
parentcc198156a5fbf657481c29329982adac3878bee4
Merge branch 'collectd-4.2' into collectd-4.3

Conflicts:

configure.in
src/plugin.c
configure.in
src/common.c
src/hddtemp.c
src/plugin.c
src/unixsock.c