projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2ef624 ef493fe)
Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:56:41 +0000 (09:56 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 26 Mar 2008 08:56:41 +0000 (09:56 +0100)

Trivial merge
collectd, the system statistics collection daemon