146fa4c Merge remote branch 'origin/el5/master'

Merged and Committed by wolfy 13 years ago
1 file changed. 0 lines added. 1 lines removed.
    Merge remote branch 'origin/el5/master'
    
    Conflicts:
    	.gitignore
    	clac.spec
    
    new upstream version
    
        
file removed
-1