Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 17 Feb 2013 15:10:54 +0000 (10:10 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sun, 17 Feb 2013 15:10:54 +0000 (10:10 -0500)
commit19ce07d34f4acc92f0564b9d254ce541ad944835
tree3ee1b113c006999d7673a835132ec8e72e767bea
parent79878755916c6b760aa8c2b4f846ec6393e1061f
parent97b0ac08454683e900c46c2ee020452d7a04b4e4
Merge branch 'master' of github.com:FreeRDP/FreeRDP