projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c15f643 8122c83)
Merge branch 'pull/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 19 Oct 2007 07:23:57 +0000 (09:23 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 19 Oct 2007 07:23:57 +0000 (09:23 +0200)

Trivial merge
collectd, the system statistics collection daemon