projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b9a04b 0fc0ad7)
Merge remote-tracking branch 'origin/pr/524'
authorMarc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 22:22:34 +0000 (23:22 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Thu, 23 Jan 2014 22:22:34 +0000 (23:22 +0100)

Trivial merge
collectd, the system statistics collection daemon