]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
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)
1  2 
source/include/proto.h
source/passdb/lookup_sid.c

Simple merge
Simple merge