cdcd6aa Merge branch 'master' of ssh://pkgs.fedoraproject.org/greybird

Merged and Committed by athmane 11 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/greybird
    
    Conflicts:
    	greybird.spec
    
        
file modified
+4 -0