[kde-baseapps] (5 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  a3ff420... 4.11.4 (*)
  e81c261... 4.11.5 (*)
  c0d31f3... Revert "4.11.5" (*)
  a3db080... Revert "4.11.4" (*)
  3792651... Merge branch 'master' into f20 (*)

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