projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d5037e 296fec5)
Merge remote-tracking branch 'origin/pr/409' into collectd-5.4
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Sep 2013 12:34:59 +0000 (14:34 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Sep 2013 12:34:59 +0000 (14:34 +0200)

Trivial merge
collectd, the system statistics collection daemon