2c50d0f Conflicts: kdepim-common < 16.12

Authored and Committed by Rex Dieter 7 years ago
    Conflicts: kdepim-common < 16.12
    
        
file modified
+7 -1