Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 9 Dec 2009 15:51:24 +0000 (16:51 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 9 Dec 2009 15:51:24 +0000 (16:51 +0100)
1  2 
src/protocols.c

diff --cc src/protocols.c
Simple merge