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

[Rex Dieter]

Summary of changes:

  2aa2dd5... 4.11.90 (*)
  2a33e2e... 4.11.95 (*)
  bbd2f9e... 4.11.97 (*)
  d73ece6... 4.12.0 (*)
  764268a... 4.12.1 (*)
  4bf6623... 4.12.2 (*)
  a9000e5... Revert "4.11.5"
  e7ebd07... Revert "4.11.4"
  d33e8f0... Merge branch 'master' into f20

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