git.samba.org
/
sfrench
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
af6d9ce
e56343f
)
Merge remote-tracking branch 'origin/v4-1-test' into master
author
Stefan Metzmacher
<metze@samba.org>
Fri, 5 Jul 2013 10:07:53 +0000
(12:07 +0200)
committer
Stefan Metzmacher
<metze@samba.org>
Fri, 5 Jul 2013 10:33:34 +0000
(12:33 +0200)
git merge -s ours origin/v4-1-test
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Trivial merge
git.samba.org / sfrench / samba-autobuild / .git / commitdiff