projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec842e4 48b597a)
Merge branch 'ff/java' of /var/lib/git/collectd into ff/java
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Feb 2009 10:13:38 +0000 (11:13 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 20 Feb 2009 10:13:38 +0000 (11:13 +0100)

Trivial merge
collectd, the system statistics collection daemon