[libkdeedu/f20] (9 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  9069cc3... 4.11.90 (*)
  9492240... 4.11.95 (*)
  f9b7dd1... 4.11.97 (*)
  788ea6f... 4.12.0 (*)
  344ea3d... 4.12.1 (*)
  093b4d2... 4.12.2 (*)
  29234bf... Revert "4.11.5"
  22be680... Revert "4.11.4"
  46d4833... Merge branch 'master' into f20

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