fa63a66 Merge branch 'master' into private-mfabian-locale-subpackaging-folders-2016-02-25

Authored and Committed by codonell 8 years ago
    Merge branch 'master' into private-mfabian-locale-subpackaging-folders-2016-02-25
    
        
file removed
-1
file removed
-567
file removed
-32
file removed
-47
file modified
+29 -29
file modified
+10 -14
file modified
+0 -2
file modified
+1 -1