projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cc3fe8 9d81184)
Merge branch 'collectd-5.5'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 14:14:48 +0000 (16:14 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 2 May 2016 14:14:48 +0000 (16:14 +0200)

Trivial merge
collectd, the system statistics collection daemon