projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ec7adf fddaa30)
Merge branch 'pull/collectd-4.0'
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 8 Aug 2007 19:43:08 +0000 (21:43 +0200)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Wed, 8 Aug 2007 19:43:08 +0000 (21:43 +0200)

Trivial merge
collectd, the system statistics collection daemon