Merge branch 'master' of github.com:awakecoding/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 27 Jan 2015 19:54:49 +0000 (14:54 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 27 Jan 2015 19:54:49 +0000 (14:54 -0500)
commitc76847dafc9c529a3472205b109255fd9d739cd0
treee7bf17da068d7a5c919ec78d81461c7e31aeadf2
parent01469276059b2c34d1bbaceae827eb26853c12ab
parentbcc702346f111dbb2c15be855905b7b032bcec05
Merge branch 'master' of github.com:awakecoding/FreeRDP