[celestia/f20] (5 commits) ...fixed conflict

[Matías Kreder]

Summary of changes:

  bb3c604... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  08ef0f0... Fix startup, thanks to a patch from Chris Rankin (*)
  9d24571... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  5833f82... Changed source type to .tar.xz (*)
  65e6921... fixed conflict

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