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

This commit is contained in:
speidy 2014-07-26 08:20:19 +03:00
commit 8e6b75b98f