projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfe12aa 9b3c5eb)
Merge branch 'processes'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:15:43 +0000 (13:15 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:15:43 +0000 (13:15 +0100)

Trivial merge
collectd, the system statistics collection daemon