[git-cola/f19] (6 commits) ...Merge branch 'master' into f20

[Kevin Kofler]

Summary of changes:

  50b617b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  90089a0... Update to 2.0.4 (*)
  eb9da54... Merge fix (*)
  8d85798... Update to 2.0.5 (#1124151) (*)
  a161d80... Revert "Merge fix" (*)
  5f7d842... Merge branch 'master' into f20 (*)

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