projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 416aab4 84d1ece)
Merge branch 'pr/36' into mqtt
authorFlorian Forster <octo@collectd.org>
Thu, 9 Jul 2015 07:35:08 +0000 (09:35 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 9 Jul 2015 07:35:08 +0000 (09:35 +0200)

Trivial merge
collectd, the system statistics collection daemon