projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be48914 6e84354)
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)

Trivial merge
collectd, the system statistics collection daemon