2c058f6 conflict resolving

Merged and Committed by hhorak 11 years ago
    conflict resolving
    
        
file modified
+5 -2