Code

Merge branch 'collectd-4.3'
authorFlorian Forster <octo@noris.net>
Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)
committerFlorian Forster <octo@noris.net>
Tue, 1 Apr 2008 13:06:56 +0000 (15:06 +0200)
1  2 
configure.in
src/plugin.c
src/unixsock.c

diff --cc configure.in
Simple merge
diff --cc src/plugin.c
Simple merge
diff --cc src/unixsock.c
Simple merge