Make this the osirium default xrdp file
Merge branch 'master' of git://github.com/FreeRDP/xrdp
Keep osirium master the same as freerdp master
Revert "Make this the osirium default xrdp file"

This reverts commit d26cb83a4f9243d0293709cc6380753d356fe159.
bug in find_name_in_lists
Merge pull request #51 from Osirium/bug/channel-enables

Bug/channel enables