[celestia/el6] (24 commits) ...fixed conflict

[Matías Kreder]

Summary of changes:

  945b13c... Fix typo that causes a failure to update the common directo (*)
  171c6c7... dist-git conversion (*)
  c172804... - New upstream release 1.6.0 (#655565) - Fix building with  (*)
  5d1f940... - Fix the license button in the about dialog not working (*)
  3d0d102... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  349c885... v1.6.1 (*)
  6a9acec... Rebuild for new libpng (*)
  474426f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  2756d8c... - Rebuilt for c++ ABI breakage (*)
  ebdf8cf... fix compile issues (*)
  e8050ab... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  0a92b8f... rebuild against new libjpeg (*)
  dfd08e2... remove non-free (or unlicensed) files (bz 888210) (*)
  c449ff1... Rebuild due to "jpeg8-ABI" feature drop (*)
  95a782c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  d124a3a... remove vendor tag from desktop file. https://fedorahosted.o (*)
  7249ce0... lua 5.2 (*)
  27bc728... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  3abaea1... FTBS, RHBZ#992048: (*)
  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 (*)
  cc4abfb... fixed conflict

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