Merge branch 'master' of github.com:FreeRDP/FreeRDP into tsg

author Marc-André Moreau <marcandre.moreau@gmail.com>

Sat, 5 May 2012 22:42:51 +0000 (18:42 -0400)

committer Marc-André Moreau <marcandre.moreau@gmail.com>

Sat, 5 May 2012 22:42:51 +0000 (18:42 -0400)
author Marc-André Moreau <marcandre.moreau@gmail.com>
Sat, 5 May 2012 22:42:51 +0000 (18:42 -0400)
committer Marc-André Moreau <marcandre.moreau@gmail.com>
Sat, 5 May 2012 22:42:51 +0000 (18:42 -0400)
diff --cc libfreerdp-crypto/tls.c
Simple merge
diff --cc libfreerdp-utils/load_plugin.c
Simple merge
diff --cc libwinpr-sspi/Kerberos/kerberos_decode.c
Simple merge
author	Marc-André Moreau <marcandre.moreau@gmail.com>
	Sat, 5 May 2012 22:42:51 +0000 (18:42 -0400)
committer	Marc-André Moreau <marcandre.moreau@gmail.com>
	Sat, 5 May 2012 22:42:51 +0000 (18:42 -0400)
		1	2
libfreerdp-crypto/tls.c	patch \|	diff1 \|	diff2 \|	blob \| history
libfreerdp-utils/load_plugin.c	patch \|	diff1 \|	diff2 \|	blob \| history
libwinpr-sspi/Kerberos/kerberos_decode.c	patch \|	diff1 \|	diff2 \|	blob \| history