projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 115d242 356901a)
Merge branch 'collectd-5.5' into collectd-5.6
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 18 Aug 2016 20:58:39 +0000 (22:58 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 18 Aug 2016 20:58:39 +0000 (22:58 +0200)

Trivial merge
collectd, the system statistics collection daemon