[xrdp/f20: 8/8] Merge branch 'master' into f20

[bojan]

commit bd83d83cd2d162826d5146bc01d7c775b30037a2
Merge: 86f8c7e bc184a5
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Mon Dec 22 18:39:57 2014 +1100

    Merge branch 'master' into f20
    
    Conflicts:
    	xrdp.spec

 xrdp-0.6.1-vnc-delay.patch |   27 +++++++++++++++++++++++++++
 xrdp.spec                  |   40 +++++++++++++++++-----------------------
 2 files changed, 44 insertions(+), 23 deletions(-)
---