projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86090b3 33c4883)
Merge branch 'collectd-4' into ff/unixsock
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 28 Jan 2007 11:24:21 +0000 (12:24 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 28 Jan 2007 11:24:21 +0000 (12:24 +0100)

Trivial merge
collectd, the system statistics collection daemon