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)
1  2 
libfreerdp/core/nego.c
winpr/libwinpr/sspi/NTLM/ntlm_av_pairs.c
winpr/libwinpr/sspi/sspi.c

Simple merge
Simple merge