Merge branch 'master' of https://github.com/FreeRDP/FreeRDP
authorArmin Novak <anovak@thinstuff.com>
Fri, 9 Aug 2013 14:17:22 +0000 (16:17 +0200)
committerArmin Novak <anovak@thinstuff.com>
Fri, 9 Aug 2013 14:17:22 +0000 (16:17 +0200)
commitebb36d4019e960dc2eb345f2f562197cdb5125f4
tree7bffdb11b6567ca85d135099f9f5668e24e014f7
parentca215eea69b310577cfd44eb8980bece718d9ebb
parentf010a4d360c4bceb231d042e163fc1641b062ba9
Merge branch 'master' of https://github.com/FreeRDP/FreeRDP