e283c7e Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	evince.spec
    	sources
    
        
file modified
+1 -13
file modified
+18 -4
file modified
+1 -1