Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
authorGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 01:30:43 +0000 (21:30 -0400)
committerGerald (Jerry) Carter <jerry@samba.org>
Fri, 2 Nov 2007 01:30:43 +0000 (21:30 -0400)
commit31286b302a4c42b9e878a9531604ea87b35dd8a9
treee8a081f44d3d89da895902a44492a8fb8cae64da
parent88ee61625a5de5e443d14c54eab91a90d87cda85
parent8bad80efb016dbd1aa392bbbc2b954d4dc9e3906
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 779353b86d1699324149896f1ffa237c6ebe46ec)
source3/param/loadparm.c