Code

Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Mar 2009 13:51:51 +0000 (14:51 +0100)
1  2 
configure.in
src/configfile.c
src/utils_cache.c

diff --cc configure.in
Simple merge
Simple merge
Simple merge