f54f8b7 Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	gedit-plugins.spec
    
        
file modified
+4 -12