projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e460da6 f1ee152)
Merge remote-tracking branch 'origin/pr/1164'
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:26:05 +0000 (23:26 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 3 Aug 2015 21:26:05 +0000 (23:26 +0200)

Trivial merge
collectd, the system statistics collection daemon