a1f7d2b fixed merging conflicts

Merged and Committed by hhorak 8 years ago
    fixed merging conflicts
    
        
file modified
+5 -2