[kmahjongg/f20] (10 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  4606701... 4.12.90 (*)
  fddfed4... 4.12.95 (*)
  9f47c8b... 4.12.97 (*)
  3fedd9a... 4.13.0 (*)
  7dafa24... 4.13.1 (*)
  d5e350c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  c174f44... 4.13.2 (*)
  0450d87... Revert "4.12.5"
  c8bbab5... Revert "4.12.4"
  ed16c28... Merge branch 'master' into f20

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