projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35dfbf6 04c96b0)
Merge remote-tracking branch 'origin/collectd-5.3' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 28 May 2015 18:21:55 +0000 (20:21 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 28 May 2015 18:21:55 +0000 (20:21 +0200)

Trivial merge
collectd, the system statistics collection daemon