c970bc7 fix pull conflicts and bump version

Merged and Committed by raveit65 10 years ago
1 file changed. 5 lines added. 2 lines removed.
    fix pull conflicts and bump version
    
        
file modified
+5 -2