projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e2c12a 8a94ccd)
Merge branch 'collectd-3.10' of octo@verplant.org:/var/lib/git/collectd into collectd...
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Jul 2006 20:34:27 +0000 (22:34 +0200)

Trivial merge
collectd, the system statistics collection daemon