git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
f5277a3
1f4838b
)
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
author
Andrew Bartlett
<abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000
(13:16 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000
(13:16 +1100)
(This used to be commit
597f9fe17685fb7909269bc0af04bf4a040e2ad7
)
Trivial merge