projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c790e6 9e6395f)
Merge remote-tracking branch 'origin/pr/1254'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)

Trivial merge
collectd, the system statistics collection daemon