projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7d9bc3 f64802f)
Merge branch 'pull/master'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:12:50 +0000 (11:12 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 21 Jan 2008 10:12:50 +0000 (11:12 +0100)

Trivial merge
collectd, the system statistics collection daemon