projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d561993 bd6f82d)
Merge remote-tracking branch 'github/pr/1093'
authorFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:34:26 +0000 (22:34 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 25 Jun 2015 20:34:26 +0000 (22:34 +0200)

Trivial merge
collectd, the system statistics collection daemon