projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 357cae1 fd06911)
Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:33:10 +0000 (09:33 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 2 Sep 2016 07:33:10 +0000 (09:33 +0200)

Trivial merge
collectd, the system statistics collection daemon