f28a074 Merge branch 'f13' into f14

Merged and Committed by rathann 13 years ago
    Merge branch 'f13' into f14
    
    Conflicts:
    	gabedit-gtk.patch
    	gabedit.spec
    
    Rebase gtk patch
    
        
file modified
+45 -45
file modified
+2 -1