270ba92 Merge remote branch 'origin/master' into f13/master

Merged and Committed by hubbitus 13 years ago
1 file changed. 4 lines added. 2 lines removed.
    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	gxneur.spec
    
        
file modified
+4 -2