Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel

This commit is contained in:
speidy 2015-08-03 23:41:55 -04:00
commit 253500ed4d