projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cacae1 7af919a)
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:12:22 +0000 (11:12 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Apr 2008 09:12:22 +0000 (11:12 +0200)

Trivial merge
collectd, the system statistics collection daemon