Code

Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 07:59:17 +0000 (08:59 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 07:59:17 +0000 (08:59 +0100)
1  2 
ChangeLog
configure.in
src/apcups.c
src/configfile.c
src/mysql.c
src/utils_dns.c

diff --cc ChangeLog
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/apcups.c
Simple merge
Simple merge
diff --cc src/mysql.c
Simple merge
diff --cc src/utils_dns.c
Simple merge