projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 01e77b9 08bd4dd)
Merge remote-tracking branch 'github/pr/1336' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 20:33:41 +0000 (21:33 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 1 Dec 2015 20:33:41 +0000 (21:33 +0100)

Trivial merge
collectd, the system statistics collection daemon