Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 Jan 2015 21:07:25 +0000 (16:07 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 Jan 2015 21:07:25 +0000 (16:07 -0500)
commit01469276059b2c34d1bbaceae827eb26853c12ab
tree45d1634730f8256cfbc3de1f35a7cd2eb96c7837
parentbcf3a551c4231eb5eb5936f6e908952089e41686
parentb73e61de6b4110450be847ebb59c2ec7504c1127
Merge branch 'master' of github.com:FreeRDP/FreeRDP