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

Trivial merge
collectd, the system statistics collection daemon