8b7657f Fix the various conflicts with the master branch

Merged and Committed by Andrea Veri 10 years ago
    Fix the various conflicts with the master branch
    
        
file modified
+1 -1
file modified
+8 -0
file modified
+14 -5
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1