projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 89318fa 5ffa49e)
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 18 Feb 2008 17:30:10 +0000 (18:30 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 18 Feb 2008 17:30:10 +0000 (18:30 +0100)

Trivial merge
collectd, the system statistics collection daemon