projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fadd45e 1afa5e0)
Merge branch 'collectd-5.6' into collectd-5.7
authorFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:43 +0000 (10:57 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 22 Dec 2016 09:57:43 +0000 (10:57 +0100)

Trivial merge
collectd, the system statistics collection daemon