33f1469 Rebase to 1.2.6

Authored and Committed by jpeeler 10 years ago
    Rebase to 1.2.6
    
        
file modified
+1 -0
file modified
+13 -5
file modified
+1 -1