059f1b4 Merge branch 'master' into f22

Merged and Committed by leigh123linux 8 years ago
    Merge branch 'master' into f22
    
        
file modified
+10 -4
x-cinnamon-mimeapps.list cinnamon-mimeapps.list
file renamed
file was renamed with no change to the file