projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0532336 acc08db)
Merge branch 'pr/1469'
authorFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 09:09:28 +0000 (10:09 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 09:09:28 +0000 (10:09 +0100)

Trivial merge
collectd, the system statistics collection daemon