Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 17:01:04 +0000 (18:01 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 17:01:04 +0000 (18:01 +0100)
commit37e6849d451c4f49c6a0c96a78a5ef81baab83d4
treed1e443f66fa367340ef04d39349e50e7100b9b5f
parentde7dc2cec059305d28cc75a5347bfd88f3cb5c95
parent0581094023ba5e561184a2ea57f6e905161de978
Merge branch 'master' of ssh://git.samba.org/data/git/samba
source3/include/includes.h
source3/include/proto.h