projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2290eae 37e5a9a)
Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 1 Sep 2007 18:59:45 +0000 (20:59 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 1 Sep 2007 18:59:45 +0000 (20:59 +0200)

Trivial merge
collectd, the system statistics collection daemon