8e9b3f Merge conflicts

Merged and Committed by Ondřej Vašík 8 years ago
    Merge conflicts
    
        
file modified
+2 -2