9b9ad7 Rebased to version 2.3.0-rc3

Authored and Committed by crobinso 9 years ago
    Rebased to version 2.3.0-rc3
    
        
file modified
+6 -3
file modified
+1 -1