Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 14:16:01 +0000 (16:16 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 14:16:01 +0000 (16:16 +0200)
commitec63a6f5ad8939cf687c69e58c28b6502724c840
tree8b2e2b3284ee00e2f415f15f0e4ffe699e481190
parent3214fb07348f67694bb169909e340a769d79ccd2
parent3b9a03a7c374d6d8e93c729f4307417cbfe2d1a6
Merge branch 'master' of git://git.samba.org/samba
source3/include/proto.h