8a0b692 resolve merge conflicts(forgot git pull)

Merged and Committed by ovasik 13 years ago
1 file changed. 5 lines added. 2 lines removed.
    resolve merge conflicts(forgot git pull)
    
        
file modified
+5 -2