git.samba.org
/
abartlet
/
samba-debian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9831799
14ebdf4
)
Merge tag 'upstream/3.6.14' into samba_4.0_ivo
author
Ivo De Decker
<ivo.dedecker@ugent.be>
Fri, 10 May 2013 12:05:31 +0000
(14:05 +0200)
committer
Ivo De Decker
<ivo.dedecker@ugent.be>
Fri, 10 May 2013 12:05:31 +0000
(14:05 +0200)
This merge is needed to explain to git that the upstream part of the tree is
based on samba 3.6.14. Without this, the merge of a newer upstream version
doesn't work.
Trivial merge
git.samba.org / abartlet / samba-debian.git / commitdiff