Code

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

diff --cc src/powerdns.c
Simple merge