Merge branch 'collectd-4.5'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 16 Oct 2008 20:14:28 +0000 (22:14 +0200)
1  2 
src/Makefile.am
src/collectd.conf.in
src/perl.c
src/postgresql.c
src/types.db

diff --cc src/Makefile.am
Simple merge
Simple merge
diff --cc src/perl.c
Simple merge
Simple merge
diff --cc src/types.db
Simple merge