Merge remote branch 'origin/ff/modbus'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:46:04 +0000 (08:46 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 7 Feb 2011 07:46:04 +0000 (08:46 +0100)
commit801389e2a2f0f232f7014702e276c5f992cca723
treec53008d6bff6d04670999cfd53b566b9d75910aa
parent0f5d1ee8c3fc787df12d72dfe1bbedaa9e80ed5f
parent688d10341f7de5fc09fa48eeb367886027e11e7e
Merge remote branch 'origin/ff/modbus'
src/collectd.conf.pod
src/modbus.c