projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4342c79 70df26d)
Merge remote-tracking branch 'origin/pr/1001'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:23:22 +0000 (09:23 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:23:22 +0000 (09:23 +0200)

Trivial merge
collectd, the system statistics collection daemon