Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorVinche <sourin-v@bridgestone-bae.com>
Mon, 10 Nov 2014 23:25:36 +0000 (00:25 +0100)
committerVinche <sourin-v@bridgestone-bae.com>
Mon, 10 Nov 2014 23:25:36 +0000 (00:25 +0100)
commitf64e0a5fe1f1445b0811437d0abdce8dfa9a528c
tree2984043f9b1a0c5503df8aaded7f24c947d1ba2c
parentd427faf5c68afbd426a9eb6d8da00ed7fbaa214d
parentb7c6e9c05050b9a5ac1d541dbd314ca9915a6d27
Merge branch 'master' of github.com:FreeRDP/FreeRDP