2287217 Merge branch 'f20'

Merged and Committed by zbyszek 10 years ago
    Merge branch 'f20'
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1