git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3a29c33
25ea110
)
Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local
author
Andrew Bartlett
<abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000
(14:34 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Wed, 21 May 2008 04:34:43 +0000
(14:34 +1000)
(This used to be commit
0e429dd1fb15137a2a7c25e051b9af8c4ed8c7f3
)
Trivial merge