2d8407 Commit the merge at the end

Authored and Committed by Pierre-Yves Chibon 9 years ago
    Commit the merge at the end
    
        
file modified
+8 -1