projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9927325 44884a0)
Merge remote-tracking branch 'github/pr/1920'
authorFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 05:58:29 +0000 (07:58 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 12 Sep 2016 05:58:29 +0000 (07:58 +0200)

Trivial merge
collectd, the system statistics collection daemon