Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 8 Aug 2014 15:42:53 +0000 (11:42 -0400)
committerBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 8 Aug 2014 15:42:53 +0000 (11:42 -0400)
commitb990c2002ad1079e1377cd6700aaa7fc0bf3346a
tree302a3ee0f628e4ff6f3ddd494a6874a67f0b727c
parent1f2f9dfbdcfad03c9035c844861d7bac6fdbc497
parent85b1d6c167e4bc818dda681c25d6251ef14b0153
Merge branch 'master' of git://github.com/awakecoding/FreeRDP