bfa0c90 Rebase to 0.80.9

Authored and Committed by branto 9 years ago
    Rebase to 0.80.9
    
        
file modified
+5 -2
file modified
+1 -1