Code

Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:48:27 +0000 (09:48 +0100)
Conflicts:

src/unixsock.c

1  2 
configure.in
src/collectd-unixsock.pod
src/liboconfig/parser.y
src/perl.c

diff --cc configure.in
Simple merge
Simple merge
Simple merge
diff --cc src/perl.c
Simple merge