Marc-André Moreau 168d46f253 Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
Conflicts:
	libfreerdp/core/nego.c
	libfreerdp/core/peer.c
	winpr/libwinpr/synch/wait.c
2014-08-15 11:43:50 -04:00
..
2014-07-25 11:31:50 +02:00
2014-07-28 16:47:42 -04:00
2014-08-11 09:19:23 +02:00
2014-08-11 09:19:23 +02:00
2014-08-13 10:14:56 -04:00
2014-08-11 09:19:23 +02:00
2014-07-24 16:34:59 +02:00