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

[Rex Dieter]

Summary of changes:

  00bf5b8... 4.11.4 (*)
  6b3bb31... 4.11.5 (*)
  5b1a939... Revert "4.11.5" (*)
  f78a391... Revert "4.11.4" (*)
  19a1d3f... Merge branch 'master' into f20 (*)

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