Merge branch 'collectd-3.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:36:46 +0000 (22:36 +0200)
commitb75b88c7dcb5e648dbc4bec2e2fbbaa3778b78b4
tree3a8674678b27f3e63c2e25507daf932d606c8261
parentbe7450d5e6e384c1f7ef7628e5ea27e77afbb582
parent179d9b650db685f5f04f36a3019e4ffea377d960
Merge branch 'collectd-3.10'
configure.in
src/apcups.c
src/collectd.conf.in