Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 20 Jun 2009 10:51:45 +0000 (12:51 +0200)
commit658e44d47088aaea3c59fb248336a74fdefe4245
treed093b20048271481afa5509dbf735596aca4f834
parent029cc5b0d4c30339c58b164d8807f568e1509ae8
parent51981096aa31e63ac104b993e013166394f71be3
Merge branch 'collectd-4.6' into collectd-4.7
src/dns.c
src/libcollectdclient/client.c