Merge branch 'ff/apcups' into collectd-4.0
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 14 Sep 2007 07:15:06 +0000 (09:15 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 14 Sep 2007 07:15:06 +0000 (09:15 +0200)
commitf709381fdef43b1857ffb72c2a2721b2a75ecd71
tree8d2bf2a135288ff0b66f7c488ff4bc8a2d81ad86
parentbe489141988ff91b2d0034454724f0917393b678
parent6e84354ee29495e07bce5884fa4c7f15cd5b7d4e
Merge branch 'ff/apcups' into collectd-4.0