58765c Merge remote-tracking branch 'origin/master' into f22

Merged and Committed by Jaroslav Škarvada 8 years ago
    Merge remote-tracking branch 'origin/master' into f22
    
        
file modified
+33 -10
file modified
+1 -1