projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: edba412 8376bd2)
Merge remote-tracking branch 'github/pr/1397'
authorFlorian Forster <octo@collectd.org>
Thu, 3 Dec 2015 06:14:15 +0000 (07:14 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 3 Dec 2015 06:14:15 +0000 (07:14 +0100)

Trivial merge
collectd, the system statistics collection daemon