projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9189e86 f1538c3)
Merge remote-tracking branch 'origin/pr/1701'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 May 2016 07:15:20 +0000 (09:15 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 10 May 2016 07:15:20 +0000 (09:15 +0200)

Trivial merge
collectd, the system statistics collection daemon