Merge tag 'samba-4.2.11' into v4-2-test
authorStefan Metzmacher <metze@samba.org>
Tue, 12 Apr 2016 19:16:50 +0000 (21:16 +0200)
committerStefan Metzmacher <metze@samba.org>
Tue, 12 Apr 2016 19:16:50 +0000 (21:16 +0200)
samba: tag release samba-4.2.11

Signed-off-by: Stefan Metzmacher <metze@samba.org>
1  2 
VERSION
libcli/smb/smb_constants.h
source3/param/loadparm.c
source3/smbd/negprot.c
source3/smbd/smb2_negprot.c
source3/wscript_build

diff --cc VERSION
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge