Merge branch 'collectd-4.2'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 10 Jan 2008 08:49:02 +0000 (09:49 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 10 Jan 2008 08:49:02 +0000 (09:49 +0100)
commitb49f3f8aca3b42e64427259dfc6c75242d37b91c
tree7f9fa7bd78ccbcce0bab64dcf4b22a9f224fbc4e
parentc2204eefe8ab6f0214144866dbcb7738855b7cd8
parent225494e854ddaa1c0570ac9a5fa15380b333a919
Merge branch 'collectd-4.2'
bindings/Makefile.am
src/collectd.conf.pod
src/configfile.c