Merge pull request #816 from awakecoding/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 Nov 2012 14:42:38 +0000 (06:42 -0800)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 22 Nov 2012 14:42:38 +0000 (06:42 -0800)
Refactoring, Channels, CMake, Settings, TSG, Command-Line Interface, .rdp File Support,


Trivial merge