projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b9630d 0a220a2)
Merge branch 'ff/processes'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 3 Dec 2006 18:05:15 +0000 (19:05 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 3 Dec 2006 18:05:15 +0000 (19:05 +0100)

Trivial merge
collectd, the system statistics collection daemon