20de9c9 Merge branch 'master' into f18

Merged and Committed by than 11 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	cantor.spec
    	sources
    
        
file modified
+1 -0
file modified
+24 -4
file modified
+1 -1