Summary of changes: 5377826... removed cdiff/decolor due to conflict with colordiff packag (*) d04f241... removed cdiff/decolor due to conflict with colordiff packag (*) This commit already existed in another branch; no separate mail sent