projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73de674 e9ad0b8)
Merge remote-tracking branch 'origin/pr/1264'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)

Trivial merge
collectd, the system statistics collection daemon