[kde-workspace/f21] (10 commits) ...Merge branch 'f21' into f20

[Kevin Kofler]

Summary of changes:

  1479091... Split kinfocenter, kmenuedit and khotkeys to subpackages (*)
  cf4c0ac... Revert "Split kinfocenter, kmenuedit and khotkeys to subpac (*)
  80ced0d... Merge branch 'master' into f20 (*)
  e7453dd... Merge branch 'master' into f20 (*)
  a07df6a... Merge branch 'master' into f20 (*)
  bddf54e... Merge branch 'master' into f20 (*)
  140dc6d... Merge branch 'master' into f20 (*)
  9cbcd19... Merge branch 'f21' into f20 (*)
  d791d55... Merge branch 'f21' into f20 (*)
  851322f... Merge branch 'f21' into f20 (*)

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