Merge branch 'ff/routeros'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 7 Dec 2009 10:59:32 +0000 (11:59 +0100)
commitca5af2937040553d53be13b5d5e049c6495c6423
tree35a15a29112ea2a12e8b5bb26940f0b8da5989e0
parenta87b2b7485986ea0ea5f8ed0f20a0507ff8dc7d5
parent963e53d03f850556fa2c5ec5c60df2c1bab208ba
Merge branch 'ff/routeros'
src/collectd.conf.pod
src/configfile.c
src/types.db