f2b10f1 Merge remote-tracking branch 'origin/f20'

Merged and Committed by Jiri Vanek 10 years ago
    Merge remote-tracking branch 'origin/f20'
    
        
file modified
+8 -1