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)
commitc5894e14771562bccd153a98610722632ca3956a
tree5ea00141df4ffa12bad3475fdafc525ffa4d92af
parenta1de4e988d7780f687bb7ed2288faf3dfbb9da71
parent84fca380f2040c53d20fff41972d2f4102183766
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
(This used to be commit 8e4dca3b9416d9b5e535bda5e4befc073bfc1641)
source3/include/proto.h
source3/passdb/lookup_sid.c