projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c5e428 a1fce14)
Merge remote-tracking branch 'github/pr/1366'
authorFlorian Forster <octo@collectd.org>
Sat, 28 Nov 2015 06:56:14 +0000 (07:56 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 28 Nov 2015 06:56:14 +0000 (07:56 +0100)

Trivial merge
collectd, the system statistics collection daemon