2101c50 Merge remote-tracking branch 'origin/master' into f20

Merged and Committed by Jan Kratochvil 9 years ago
    Merge remote-tracking branch 'origin/master' into f20
    
        
file modified
+38 -0
file modified
+4 -1