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

[Rex Dieter]

Summary of changes:

  cddc9a3... 4.11.4 (*)
  2b14a0b... 4.11.5 (*)
  168a888... Revert "4.11.5" (*)
  d0b4df9... Revert "4.11.4" (*)
  7fb6411... Merge branch 'master' into f20 (*)

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