aea82b7 Merge branch 'f20'

Merged and Committed by Rex Dieter 10 years ago
    Merge branch 'f20'
    
    Conflicts:
    	.gitignore
    	cantor.spec
    	sources
    
    4.13.0-3
    
    - Missing cantor python interface (#1095918)
    - Provides: cantor-part
    
        
file modified
+0 -27
file modified
+60 -6