6a092a Merge branch 'f25' into f24

Merged and Committed by Jan Synacek 8 years ago
    Merge branch 'f25' into f24
    
        
file modified
+1 -0
file modified
+5 -3
file modified
+1 -1