Merge branch 'ad/redis'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:43:37 +0000 (18:43 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:43:37 +0000 (18:43 +0200)
1  2 
src/Makefile.am
src/collectd.conf.pod

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