6e11c88 - Merge fix

Merged and Committed by heliocastro 8 years ago
    - Merge fix
    
        
file modified
+6 -4
file modified
+4 -0