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)
commitb9646aa15a6bfa96239b1e0775ef2e87a1be5676
tree487862b19760c855bf70f9a6f6fa354691499b90
parentd2f971b93c68b110c80be151eb6c5e65bd6d189c
parent08d2e13121e70afcf65d3925a16b4c8a6f41c915
Merge branch 'master' into ff/java
configure.in
src/Makefile.am
src/collectd.conf.pod