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

[Kevin Kofler]

commit df21ea5e75148830ee35f072fdcdf14481ee14f2
Merge: 55d2d63 18a1e24
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Aug 21 13:17:17 2011 +0200

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

 .gitignore    |    1 +
 git-cola.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---