projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6f4cbc 6d13532)
Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 07:34:07 +0000 (08:34 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 28 Feb 2016 07:34:07 +0000 (08:34 +0100)

Trivial merge
collectd, the system statistics collection daemon