From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 14 Sep 2007 07:15:06 +0000 (+0200)
Subject: Merge branch 'ff/apcups' into collectd-4.0
X-Git-Tag: collectd-4.0.9~6
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=f709381fdef43b1857ffb72c2a2721b2a75ecd71;hp=f709381fdef43b1857ffb72c2a2721b2a75ecd71;p=collectd.git

Merge branch 'ff/apcups' into collectd-4.0
---