Merge branch 'master' of git://git.samba.org/samba into convenience
authorJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 21:25:57 +0000 (22:25 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 1 Mar 2009 21:25:57 +0000 (22:25 +0100)
commit9551ab8f7b0e69349dc0c1ffb70a6f67163b242c
tree075bfaec7798dc54db47398ab6ebfe68c85b1573
parent7ab8f373c84c328b197f923287163e83371e7ccb
parent8568b4fa9ff8f6f1a24547ec2ed5e2942b213d9e
Merge branch 'master' of git://git.samba.org/samba into convenience
source3/Makefile.in
source3/include/proto.h
source3/include/smb.h