011a5c Merge remote-tracking branch 'origin' into f21

Merged and Committed by petersen 4 years ago
    Merge remote-tracking branch 'origin' into f21
    
    Conflicts:
    	google-noto-fonts.spec
    
        
file modified
+3 -3