40f5eb Merge branch 'f25' into f26

Merged and Committed by Zdenek Dohnal 7 years ago
1 file changed. 6 lines added. 3 lines removed.
    Merge branch 'f25' into f26
    
        
file modified
+6 -3