projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb483e3 f4c25b4)
Merge branch 'master' into ff/modbus
authorFlorian Forster <octo@noris.net>
Wed, 24 Mar 2010 09:08:51 +0000 (10:08 +0100)
committerFlorian Forster <octo@noris.net>
Wed, 24 Mar 2010 09:08:51 +0000 (10:08 +0100)

Trivial merge
collectd, the system statistics collection daemon