4396d7c Rebase to 1.2.5

Authored and Committed by fcami 10 years ago
    Rebase to 1.2.5
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1