Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Mon, 9 Dec 2013 14:37:38 +0000 (09:37 -0500)
committerBenoît LeBlanc <benoit.leblanc@awakecoding.com>
Mon, 9 Dec 2013 14:37:38 +0000 (09:37 -0500)

Trivial merge