b8aba2d Merge branch '2.6.3-tmp'

Merged and Committed by olea 9 years ago
    Merge branch '2.6.3-tmp'
    
    Conflicts:
    	OmegaT.spec
    
        
file modified
+2 -0
file modified
+33 -11