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

[Rex Dieter]

Summary of changes:

  68e8416... 4.11.4 (*)
  2feb89f... 4.11.5 (*)
  9f68290... Revert "4.11.5" (*)
  5878c75... Revert "4.11.4" (*)
  d3b1145... Merge branch 'master' into f20 (*)

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