4087a79 Merge branch 'master' of ssh://pkgs.fedoraproject.org/desktop-backgrounds

Merged and Committed by mso 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/desktop-backgrounds
    
    Conflicts:
    	desktop-backgrounds.spec
    
        
file modified
+3 -0