edc6ac6 Rebase to v0.19.12, take 6

Authored and Committed by coec 11 years ago
    Rebase to v0.19.12, take 6
    
        
file modified
+1 -1