24220e5 Merge branch 'master' of ssh://pkgs.fedoraproject.org/lcgdm

Merged and Committed by aalvarez 10 years ago
1 file changed. 8 lines added. 2 lines removed.
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/lcgdm
    
    Conflicts:
    	lcgdm.spec
    
        
file modified
+8 -2