Summary of changes: 8c0357f... fix the colorschemes.knsrc file conflict correctly (also pa (*) 851322f... Merge branch 'f21' into f20 (*) This commit already existed in another branch; no separate mail sent