Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 May 2014 17:59:25 +0000 (13:59 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 May 2014 17:59:25 +0000 (13:59 -0400)
commit146305f9b23f4c2f32d9988d36cc02a9765d1266
tree69548c304f3ab7fdd87ed33bcc0b494672acdcd7
parent247beff1b3b7d741860d5ae1ac8effcc0ed3829e
parentad4d8d2c59ea75babee80767e6625ca6ea23fa0c
Merge branch 'master' of github.com:FreeRDP/FreeRDP