projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca4a6c8 778a672)
Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:19:41 +0000 (17:19 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 15 Jan 2016 16:19:41 +0000 (17:19 +0100)

Trivial merge
collectd, the system statistics collection daemon