projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 780e6a7 18159ad)
Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:29:58 +0000 (00:29 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 7 Jul 2015 22:29:58 +0000 (00:29 +0200)

Trivial merge
collectd, the system statistics collection daemon