Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorSimo Sorce <idra@samba.org>
Wed, 3 Sep 2008 15:52:54 +0000 (11:52 -0400)
committerSimo Sorce <idra@samba.org>
Wed, 3 Sep 2008 15:52:54 +0000 (11:52 -0400)
commit8e4dca3b9416d9b5e535bda5e4befc073bfc1641
treeb34c42ac96881b15515556c7c7ed527f29503f20
parente038f1cf9fb305fc1e7a4189208e451d30aaa1f0
parent32cb45c962c822bd79a7d0f666f2f6037060b324
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
source/include/proto.h
source/passdb/lookup_sid.c