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)
commitad8739289d8f254545f3426ec3a34ef30594db7c
tree697f8286e015a7449660a9e44360aa483e518fa5
parent9fc09fc6630a70205b7c284f3e245629137faa9d
parentc87e3fc2bc4dc41e9c36371a1d421c6f5b4a3c60
Merge branch 'collectd-4.4' of octo@verplant.org:/var/lib/git/collectd into collectd-4.4
src/powerdns.c