e13c11a - Merge with than fixes

Merged and Committed by heliocastro 8 years ago
    - Merge with than fixes
    
        
file modified
+7 -6