Code

Merge branch 'master' of git://git.verplant.org/collectd
authorFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:18:13 +0000 (17:18 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 23 Jul 2008 15:18:13 +0000 (17:18 +0200)
1  2 
src/Makefile.am
src/collectd.conf.pod

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