Merge branch 'master' into ff/java
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 22 Feb 2009 18:50:14 +0000 (19:50 +0100)
1  2 
configure.in
src/Makefile.am
src/collectd.conf.pod
src/perl.c

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