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

[Rex Dieter]

Summary of changes:

  6718ab2... 4.11.4 (*)
  6986c58... 4.11.5 (*)
  b433df4... Revert "4.11.5" (*)
  9e712b3... Revert "4.11.4" (*)
  12f6f18... Merge branch 'master' into f20 (*)

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