git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
148d3b1
6b013c9
)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
author
Jelmer Vernooij
<jelmer@samba.org>
Sun, 13 Apr 2008 20:49:08 +0000
(22:49 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Sun, 13 Apr 2008 20:49:08 +0000
(22:49 +0200)
(This used to be commit
9b8448c1e4567be26fa4890c647e0d4d46efbe20
)
Trivial merge