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)
commita1de4e988d7780f687bb7ed2288faf3dfbb9da71
treeabc569f52f33efdf48135faf7f0c790601eef229
parent5e7655fa27f7b2c9c54edfc25f86974dbdb23ea4
parent95cc5ee395ab9d7f6f79d341ad20bc486c292a8d
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
(This used to be commit e038f1cf9fb305fc1e7a4189208e451d30aaa1f0)
source3/include/proto.h
source3/passdb/lookup_sid.c