projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b99f2ef ec9b92a)
Merge remote-tracking branch 'github/pr/1027'
authorFlorian Forster <octo@collectd.org>
Tue, 19 May 2015 08:45:57 +0000 (10:45 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 19 May 2015 08:45:57 +0000 (10:45 +0200)

Trivial merge
collectd, the system statistics collection daemon