Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Aug 2014 15:43:50 +0000 (11:43 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Aug 2014 15:43:50 +0000 (11:43 -0400)
commit168d46f2532c8cdae83a2799a19bcf2556d597fa
treed1e1a2bcd6a172ae9e14b4b29e8a85191218b9bc
parent31ac35698fe9fe0214669028098885f69e4b6a37
parent5906efc5f779e0eef6c19d4885783d54851a9e83
Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP

Conflicts:
libfreerdp/core/nego.c
libfreerdp/core/peer.c
winpr/libwinpr/synch/wait.c
libfreerdp/core/nego.c
winpr/libwinpr/synch/wait.c