git.samba.org
/
tprouty
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8623c98
440b1a1
)
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 21 Jan 2008 11:01:32 +0000
(22:01 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Mon, 21 Jan 2008 11:01:32 +0000
(22:01 +1100)
(This used to be commit
b99b604a5f8b7eb98a6285145188c0b94946df78
)
Trivial merge