Merge pull request #14321 from bobvanderlinden/pr-gitcola-2.5
git-cola: 2.2.1 -> 2.5
Frederik Rietdijk 10 years ago 3d1523eb 7f90eabe