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)
commiteb083585c8d77f56b107e07e203f7a0594f79d3e
tree525f625d821390f2fb3ba0722a5d6ab1773f7580
parent7477d555a1dab3bee2db3eff26f2b2e5e5334956
parent9dcf9ea610f35d88927ff17dcd07b6ae0aaaeba6
Merge branch 'ff/modbus'
configure.in
src/collectd.conf.pod