git.samba.org / idra / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69c6f16 d1db41c)
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 17:39:15 +0000 (12:39 -0500)
committerGerald (Jerry) Carter <jerry@samba.org>
Sun, 21 Oct 2007 17:39:15 +0000 (12:39 -0500)
(This used to be commit 33f690b3de03dc300590c3f69718f608b104a529)


Trivial merge
Work In Progress