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

[Rex Dieter]

Summary of changes:

  84ee38d... 4.11.90 (*)
  5957f12... 4.11.95 (*)
  f7c4719... 4.11.97 (*)
  cb38b13... 4.12.0 (*)
  6ccfc57... 4.12.1 (*)
  7cd7fe1... 4.12.2 (*)
  76b8544... Revert "4.11.5"
  10ac1d9... Revert "4.11.4"
  395732c... Merge branch 'master' into f20

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