git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d3ee935
b3f4826
)
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into dmapi-integration
author
Alexander Bokovoy
<ab@samba.org>
Wed, 6 Feb 2008 05:58:20 +0000
(08:58 +0300)
committer
Alexander Bokovoy
<ab@samba.org>
Wed, 6 Feb 2008 05:58:20 +0000
(08:58 +0300)
(This used to be commit
f59d3786abcc53065c838a2fa82ec2f4b577b16f
)
Trivial merge