projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 961f674 0dbacda)
Merge branch 'collectd-3.10'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 4 Nov 2006 12:18:06 +0000 (13:18 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 4 Nov 2006 12:18:06 +0000 (13:18 +0100)

Trivial merge
collectd, the system statistics collection daemon