Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Thu, 19 Jun 2014 13:47:17 +0000 (09:47 -0400)
committerBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Thu, 19 Jun 2014 13:47:17 +0000 (09:47 -0400)

Trivial merge