projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f5d58f
4f9adee
)
Merge branch 'collectd-5.5' into collectd-5.6
author
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:31:39 +0000
(12:31 +0100)
committer
Ruben Kerkhof
<ruben@rubenkerkhof.com>
Tue, 29 Nov 2016 11:31:39 +0000
(12:31 +0100)
Conflicts:
contrib/redhat/collectd.spec
Trivial merge
projects / collectd.git / commitdiff