Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
authorJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 16:38:45 +0000 (18:38 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 24 Sep 2008 16:38:45 +0000 (18:38 +0200)
commitedeb20b92128f1859d2d8ecee820846ac5799ed5
treeb7c66bf4da6bbe5628fc25def555448d1789b5b1
parentda01822671b3a553fd805315df7322b8225cfe95
parentd2062ab74f7684f8b6975a7415fac23389851278
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4

Conflicts:
source3/include/includes.h
source3/Makefile.in
source3/include/includes.h
source3/include/proto.h
source3/libsmb/ntlmssp_sign.c