Merge branch 'master' of github.com:ivan-83/FreeRDP
authorivan-83 <rozhuk.im@gmail.com>
Thu, 28 May 2015 00:26:24 +0000 (03:26 +0300)
committerivan-83 <rozhuk.im@gmail.com>
Thu, 28 May 2015 00:26:24 +0000 (03:26 +0300)
commita520d8b3fa44a82c4beb67eb844eeff901c34758
tree4c7d3a2c1c9c843b22833f80fcc08d58ba60312e
parent9313197023e5b5994fad45aeee385492387cf034
parent9d6b5a2a6be98fc1d4f2317329a67956c61e4751
Merge branch 'master' of github.com:ivan-83/FreeRDP