Merge branch 'color-fix' of https://github.com/qykth-git/gitk

Paul Mackerras committed Dec 19, 2015 at 13:29 UTC 04d04c071e44a7d5f5813a00febfc33527af338f

No changes.