Merge branch 'ff/modbus'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 5 Apr 2010 12:10:44 +0000 (14:10 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 5 Apr 2010 12:10:44 +0000 (14:10 +0200)
1  2 
configure.in
src/collectd.conf.pod

diff --cc configure.in
Simple merge
Simple merge