projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c81811 5664fba)
Merge branch 'collection3-data-sources' of git://github.com/raimue/collectd
authorFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:31:29 +0000 (20:31 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:31:29 +0000 (20:31 +0100)

Trivial merge
collectd, the system statistics collection daemon