Merge branch 'master' into ff/java
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Feb 2009 17:46:40 +0000 (18:46 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 18 Feb 2009 17:46:40 +0000 (18:46 +0100)
1  2 
configure.in
src/Makefile.am
src/collectd.conf.pod

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