projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1894607
61adba6
)
Merge branch 'collectd-5.3' into collectd-5.4
author
Florian Forster
<octo@collectd.org>
Sat, 6 Sep 2014 09:27:56 +0000
(11:27 +0200)
committer
Florian Forster
<octo@collectd.org>
Sat, 6 Sep 2014 09:27:56 +0000
(11:27 +0200)
Conflicts:
src/curl.c
1
2
src/curl.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/curl.c
Simple merge