projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f54383f 00ff99d)
Merge branch 'pull/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 23 Sep 2007 13:14:36 +0000 (15:14 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 23 Sep 2007 13:14:36 +0000 (15:14 +0200)

Trivial merge
collectd, the system statistics collection daemon