a81da4d Merge remote branch 'origin/f13/master'

Merged and Committed by dwayne 13 years ago
    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	sources
    	translate-toolkit.spec
    
    Adapt specfile to conditionally include BuildRequires and Requires
    depending on Fedora version
    
        
file modified
+0 -1
file modified
+6 -0