6baf84 Rebased to version 2.5.0-rc2

Authored and Committed by crobinso 8 years ago
    Rebased to version 2.5.0-rc2
    
        
file modified
+6 -3
file modified
+1 -1