92962e5 Merge branch 'master' into f20

Merged and Committed by zbyszek 10 years ago
1 file changed. 6 lines added. 2 lines removed.
    Merge branch 'master' into f20
    
        
file modified
+6 -2