[git-cola] (3 commits) ...Merge branch 'master' into f20

[Kevin Kofler]

Summary of changes:

  eb9da54... Merge fix (*)
  a161d80... Revert "Merge fix" (*)
  5f7d842... Merge branch 'master' into f20 (*)

(*) This commit already existed in another branch; no separate mail sent