projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f64a8b0 56d85ff)
Merge remote-tracking branch 'github/pr/1085'
authorFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 18:38:38 +0000 (20:38 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 16 Jun 2015 18:38:38 +0000 (20:38 +0200)

Trivial merge
collectd, the system statistics collection daemon