Code

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)
1  2 
src/dns.c
src/libcollectdclient/client.c

diff --cc src/dns.c
Simple merge
Simple merge