projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ea76be be7450d)
Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 19 Jul 2006 16:52:20 +0000 (18:52 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 19 Jul 2006 16:52:20 +0000 (18:52 +0200)

Trivial merge
collectd, the system statistics collection daemon