c309c07 Problem with the git merge, now fixed

Authored and Committed by Alexandre Beche 10 years ago
    Problem with the git merge, now fixed
    
        
file modified
+3 -11