9be453e rebase with upstream 1.1.4-1

Authored and Committed by imcleod 10 years ago
    rebase with upstream 1.1.4-1
    
        
file modified
+1 -0
file modified
+4 -4
file modified
+1 -1