projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3348ace 168347a)
Merge remote-tracking branch 'origin/pr/1216'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:36:19 +0000 (23:36 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 13 Aug 2015 21:36:19 +0000 (23:36 +0200)

Trivial merge
collectd, the system statistics collection daemon