0c873be Merge branch 'master' into f17

Merged and Committed by nucleo 11 years ago
    Merge branch 'master' into f17
    
    ktorrent-4.3.1
    
        
file modified
+1 -0
file modified
+6 -3
file modified
+1 -1