3af0fad Merge branch 'master' into f15

Merged and Committed by xhorak 12 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	.gitignore
    	scantailor.spec
    	sources
    
        
file modified
+4 -0
empty file added
file modified
+4 -1
file modified
+4 -0