6aa2dfa Merge branch 'f22'

Merged and Committed by jamielinux 8 years ago
    Merge branch 'f22'
    
        
file modified
+2 -2
file modified
+4 -1
file modified
+2 -2