9146d48 Merge branch 'master' into f21

Merged and Committed by xhorak 9 years ago
    Merge branch 'master' into f21
    
        
file modified
+2 -0
file modified
+6 -5
file removed
-870
file modified
+2 -2