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

[Rex Dieter]

Summary of changes:

  cc41a5e... 4.11.4 (*)
  e3171c8... 4.11.5 (*)
  9ab814e... Revert "4.11.5" (*)
  31b7b04... Revert "4.11.4" (*)
  e8d6a26... Merge branch 'master' into f20 (*)

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