Code

Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 2 Dec 2008 22:31:32 +0000 (23:31 +0100)
1  2 
src/plugin.c
src/plugin.h

diff --cc src/plugin.c
Simple merge
diff --cc src/plugin.h
Simple merge