git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
cb40b1a
b4c708c
)
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
author
Jeremy Allison
<jra@samba.org>
Wed, 10 Sep 2008 21:57:52 +0000
(14:57 -0700)
committer
Jeremy Allison
<jra@samba.org>
Wed, 10 Sep 2008 21:57:52 +0000
(14:57 -0700)
(This used to be commit
a03b0dde01e4cebe07a65af3943d178dbdeda276
)
Trivial merge