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

[Rex Dieter]

Summary of changes:

  9f32f8c... 4.11.90 (*)
  c883cb9... 4.11.95 (*)
  ed8ea7f... 4.11.97 (*)
  5d6d2dd... 4.12.0 (*)
  8b28fdb... 4.12.1 (*)
  216e09c... 4.12.2 (*)
  05390d5... Revert "4.11.5"
  dc8712b... Revert "4.11.4"
  4b5999f... Merge branch 'master' into f20

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