efaf375 Merge branch 'epel7'

Merged and Committed by Rex Dieter 9 years ago
1 file changed. 5 lines added. 2 lines removed.
    Merge branch 'epel7'
    
    Conflicts:
    	digikam.spec
    
        
file modified
+5 -2