509b9e5 Merge branch 'master' into f23

Merged and Committed by Rex Dieter 8 years ago
    Merge branch 'master' into f23
    
        
0293-Fix-QtDBus-deadlock-inside-kded-kiod.patch QTBUG-51676-Fix-QtDBus-deadlock-inside-kded-kiod.patch
file renamed
+73 -22
file modified
+11 -3
file modified
+30 -18