348c7a1 Merge branch 'f25'

Merged and Committed by Martin Briza 7 years ago
    Merge branch 'f25'
    
        
file modified
+1 -0
file modified
+15 -3
file modified
+1 -1