9f3147b Merge branch 'master' of ssh://jerboaa@pkgs.fedoraproject.org/cglib.git

Merged and Committed by Severin Gehwolf 11 years ago
1 file changed. 28 lines added. 27 lines removed.
    Merge branch 'master' of ssh://jerboaa@pkgs.fedoraproject.org/cglib.git
    
    Conflicts:
    	cglib.spec
    
        
file modified
+28 -27