Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async
authorArmin Novak <anovak@thinstuff.com>
Fri, 4 Oct 2013 09:44:10 +0000 (11:44 +0200)
committerArmin Novak <anovak@thinstuff.com>
Fri, 4 Oct 2013 09:44:10 +0000 (11:44 +0200)
commitdfab92ada83c008eb9b3fd51bddb73eac458d9e0
tree6f51330a30eab9ae3aed4443693ddf89c95b6855
parent051892a8b1f2ac66657669d23d69d71316fde7b5
parente46f95120ae1599fd475eb89004b039781ef42f5
Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async