Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Wed, 6 Nov 2013 22:43:03 +0000 (17:43 -0500)
committerBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Wed, 6 Nov 2013 22:43:03 +0000 (17:43 -0500)

Trivial merge