Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Thu, 21 Aug 2008 15:25:01 +0000 (17:25 +0200)
committerFlorian Forster <octo@noris.net>
Thu, 21 Aug 2008 15:25:01 +0000 (17:25 +0200)
1  2 
src/plugin.c

diff --cc src/plugin.c
Simple merge