git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23f6c37 80b7bcb)
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 19 Oct 2007 20:54:32 +0000 (15:54 -0500)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 19 Oct 2007 20:54:32 +0000 (15:54 -0500)
(This used to be commit 23d3db0c229fe5e1d69f890d87c2be39b356ffb5)


Trivial merge
Kai's WIP code