projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce2fb80 96c33de)
Merge branch 'pr/1394'
authorFlorian Forster <octo@collectd.org>
Wed, 2 Dec 2015 09:44:43 +0000 (10:44 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 2 Dec 2015 09:44:43 +0000 (10:44 +0100)

Trivial merge
collectd, the system statistics collection daemon