Merge branch 'master' of https://github.com/dpoe/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 19 Jan 2013 00:28:55 +0000 (19:28 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 19 Jan 2013 00:28:55 +0000 (19:28 -0500)
commitc6e6956a437d0ccd156bf0ef527fc71ad52e37e8
tree24eb6d27f7ff0f3b441e7a38445f8680996c4a8c
parent9ae698c1e53946ce589f2cf998abed6f4ae5429d
parentb64408975de59185caa774ca6a30181a1ea2590a
Merge branch 'master' of https://github.com/dpoe/FreeRDP