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)
commite7be1d7ea062e8d4d59c04c42e63d655188dc597
treef23d6394621ade517c8333e2816ebfe3908d83bf
parent97a1b92446be5e0ebb68d25ec8b94743f2ac12fb
parente76aaa05606e1dfb443a4e4c7028c0ee6ed558e3
Merge branch 'ad/redis'
src/Makefile.am
src/collectd.conf.pod