freerdp: merging with master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 14 Jan 2013 18:50:16 +0000 (13:50 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 14 Jan 2013 18:50:16 +0000 (13:50 -0500)
commit3d77d5a497450d225c74800027ea065c40290c52
treeeaacebe31ee7a6d0f8123a8d3ed949bb44912baf
parent136bbc8bf77f7b18de1e3d8bc709accd04bd4392
parent9f4b41d377bb8ae3087f88cf9bc3034e79655c6e
freerdp: merging with master
libfreerdp/core/nego.c
winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
winpr/libwinpr/sspi/sspi.c