projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da4589d 3e0d21f)
Merge remote-tracking branch 'github/pr/2391' into collectd-5.6
authorFlorian Forster <octo@collectd.org>
Wed, 20 Sep 2017 17:34:56 +0000 (19:34 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 20 Sep 2017 17:34:56 +0000 (19:34 +0200)

Trivial merge
collectd, the system statistics collection daemon