projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b611928 974362b)
Merge branch 'ff/zfs'
authorFlorian Forster <octo@collectd.org>
Fri, 23 Mar 2012 12:53:39 +0000 (13:53 +0100)
committerFlorian Forster <octo@collectd.org>
Fri, 23 Mar 2012 12:53:39 +0000 (13:53 +0100)

Trivial merge
collectd, the system statistics collection daemon