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

[Rex Dieter]

Summary of changes:

  15515f2... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  09a9c60... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  d8c3337... Requires: kactivities (unversioned) (*)
  09225f4... Revert "- Rebuilt for https://fedoraproject.org/wiki/Fedora (*)
  50f43fb... Merge branch 'master' into f21 (*)

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