projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbcda5a 4a5e97d)
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Dec 2007 11:11:17 +0000 (12:11 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 15 Dec 2007 11:11:17 +0000 (12:11 +0100)

Trivial merge
collectd, the system statistics collection daemon