Code

Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 12 Dec 2007 08:05:55 +0000 (09:05 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 12 Dec 2007 08:05:55 +0000 (09:05 +0100)
1  2 
src/plugin.c

diff --cc src/plugin.c
Simple merge