projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f5b757 19b51c4)
Merge branch 'collectd-5.7' into collectd-5.8
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Nov 2017 21:15:11 +0000 (22:15 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Nov 2017 21:15:11 +0000 (22:15 +0100)

Trivial merge
collectd, the system statistics collection daemon