c14ec3f Merge branch 'master' into f20

Merged and Committed by Rex Dieter 9 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	digikam.spec
    
        
file modified
+1 -0
file modified
+51 -8
file modified
+1 -1