Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 5 May 2008 14:44:11 +0000 (16:44 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 5 May 2008 14:44:11 +0000 (16:44 +0200)
1  2 
src/powerdns.c

diff --cc src/powerdns.c
Simple merge