b3d48ca Merge branch 'master' of ssh://pkgs.fedoraproject.org/kde-partitionmanager

Merged and Committed by Mattia Verga 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/kde-partitionmanager
    
    Conflicts:
    	kde-partitionmanager.spec
    
        
file modified
+5 -2