0b05b37 Cleanup merger

Authored and Committed by corsepiu 7 years ago
    Cleanup merger
    
        
file modified
+0 -3