Code

Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Nov 2009 19:18:05 +0000 (20:18 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Nov 2009 19:18:05 +0000 (20:18 +0100)
1  2 
src/Makefile.am
src/rrdcached.c

diff --cc src/Makefile.am
Simple merge
diff --cc src/rrdcached.c
Simple merge