5f1a42 Rebased to version 1.2.15

Authored and Committed by crobinso 9 years ago
    Rebased to version 1.2.15
    
        
file modified
+27 -23
file modified
+1 -2