projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3acac9b ee13823)
Merge branch 'pull/collectd-4'
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Fri, 20 Apr 2007 06:20:28 +0000 (08:20 +0200)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Fri, 20 Apr 2007 06:20:28 +0000 (08:20 +0200)

Trivial merge
collectd, the system statistics collection daemon