projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adf0353 a9a6614)
Merge branch 'ps/reuse'
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 8 Dec 2007 12:02:41 +0000 (13:02 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 8 Dec 2007 12:02:41 +0000 (13:02 +0100)

Trivial merge
collectd, the system statistics collection daemon