projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44dda7b 5afcfb3)
Merge remote-tracking branch 'origin/pr/1260'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:34:18 +0000 (22:34 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:34:18 +0000 (22:34 +0200)

Trivial merge
collectd, the system statistics collection daemon