projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a526437 d925605)
Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 21 Apr 2007 09:39:33 +0000 (11:39 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 21 Apr 2007 09:39:33 +0000 (11:39 +0200)

Trivial merge
collectd, the system statistics collection daemon