projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5627511 1cc2a82)
Merge branch 'ff/entropy' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 22 Jan 2007 21:36:40 +0000 (22:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 22 Jan 2007 21:36:40 +0000 (22:36 +0100)

Trivial merge
collectd, the system statistics collection daemon