projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b70741d 3b84d1b)
Merge branch 'master' into ff/modbus
authorFlorian Forster <octo@noris.net>
Wed, 17 Mar 2010 12:45:36 +0000 (13:45 +0100)
committerFlorian Forster <octo@noris.net>
Wed, 17 Mar 2010 12:45:36 +0000 (13:45 +0100)

Trivial merge
collectd, the system statistics collection daemon