Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorSimo Sorce <idra@samba.org>
Tue, 26 Aug 2008 22:56:49 +0000 (18:56 -0400)
committerSimo Sorce <idra@samba.org>
Tue, 26 Aug 2008 22:56:49 +0000 (18:56 -0400)
commite038f1cf9fb305fc1e7a4189208e451d30aaa1f0
tree15f9e9e7e57d64206e5d3423415774fe0fab2c4e
parent8594edf666c29fd4ddf1780da842683dd81483b6
parent566d3b6e76afeca8e862cb36202a5283b86920e4
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
source/include/proto.h
source/passdb/lookup_sid.c