Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Mar 2015 12:01:54 +0000 (08:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Mon, 16 Mar 2015 12:01:54 +0000 (08:01 -0400)
commitc21bff54154ed1c91a531ee91e274d445e5150ae
tree07f1826de0167d72c0c5bf584dbc725490b0bdb1
parentf226c27fb0a61f4673bf29b8517a4483d1b16c03
parentd7bdb509c8206e4afea074b7169fa4d81aeef786
Merge branch 'master' of github.com:FreeRDP/FreeRDP