b6e3fb7 rebase to 2.6.0

Authored and Committed by msuchy 10 years ago
    rebase to 2.6.0
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1