Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 14:38:29 +0000 (09:38 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 15 Nov 2013 14:38:29 +0000 (09:38 -0500)
commita6af3f5c0a1beefa6a11b1b45abadb3adbcc2c9d
tree13113f43716f90dc5b1ce38d2fdb6f92deed0638
parent5fc0f72c909f9bfbcbe47ccc1963e9b1394e73f9
parent9fcf5eadf0fcd41eb9410bb690f3152a5abaf1be
Merge branch 'master' of github.com:FreeRDP/FreeRDP