Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 31 Jan 2014 15:48:31 +0000 (10:48 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 31 Jan 2014 15:48:31 +0000 (10:48 -0500)
commitdd789ba9ba14f41585a1c494b25639f0584e4837
treef0ef8938c19e2f8c964d9564dfa2448720929457
parent839bcb42ae8cedebc4819f8050f88ea32edb880c
parent02c9d07bcf69177507879c8260c443f590392360
Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP