c823ca Merge branch 'f25' into f26

Merged and Committed by Zdenek Dohnal 7 years ago
    Merge branch 'f25' into f26
    
        
file modified
+17 -9
file modified
+4 -1