838fccf resolve merge

Merged and Committed by Jan Kaluza 11 years ago
    resolve merge
    
        
file modified
+6 -0