[git-cola/f14/master: 6/6] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/git-cola into f14/master

[Kevin Kofler]

commit 0365d83f8878f9682f2add0f4c2637273f143071
Merge: 6bbe772 df2cd23
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Jan 5 09:08:23 2011 +0100

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/git-cola into f14/master

 .gitignore                     |    1 +
 cola-1.4.3-translations.patch  |   18 ++++++++++++++++++
 git-cola-1.4.1.2-docpath.patch |   13 -------------
 git-cola.spec                  |   23 +++++++++++++----------
 sources                        |    2 +-
 5 files changed, 33 insertions(+), 24 deletions(-)
---