projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fae34a3 07d5fdf)
Merge branch 'master' into collectd-4
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Jan 2007 17:36:26 +0000 (18:36 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 15 Jan 2007 17:36:26 +0000 (18:36 +0100)
Conflicts:

src/sensors.c


Trivial merge
collectd, the system statistics collection daemon