git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8acc7f7
cc43037
)
Merge branch 'abartlet-4-0-local' into v4-0-test
author
Andrew Tridgell
<tridge@samba.org>
Fri, 22 Aug 2008 07:37:43 +0000
(17:37 +1000)
committer
Andrew Tridgell
<tridge@samba.org>
Fri, 22 Aug 2008 07:37:43 +0000
(17:37 +1000)
(This used to be commit
469fac2669991b130dec219e1a109a8b2ce224be
)
Trivial merge