e354fe8 Merge branch 'master' into epel7

Merged and Committed by Rex Dieter 9 years ago
    Merge branch 'master' into epel7
    
    Conflicts:
    	digikam.spec
    
        
file modified
+1 -15
file modified
+61 -13
file modified
+1 -1