projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af18c7e 7c6b850)
Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 1 Sep 2007 09:07:58 +0000 (11:07 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 1 Sep 2007 09:07:58 +0000 (11:07 +0200)

Trivial merge
collectd, the system statistics collection daemon