projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21ebca2 20d30b1)
Merge branch 'pull/collectd-4' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Apr 2007 19:56:43 +0000 (21:56 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Apr 2007 19:56:43 +0000 (21:56 +0200)

Trivial merge
collectd, the system statistics collection daemon