projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f01e1bf 2648e10)
Merge branch 'pull/collectd-4.1' into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 10:19:19 +0000 (12:19 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 28 Sep 2007 10:19:19 +0000 (12:19 +0200)

Trivial merge
collectd, the system statistics collection daemon