[kactivities] (9 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  a3ed089... 4.8.4 (*)
  4834a7e... 4.8.5 (*)
  da7aa97... Merge branch 'master' into f17 (*)
  a90a296... fix merge (*)
  7c9f723... Merge branch 'master' into f17 (*)
  ad8e0bd... Merge branch 'f18' into f17 (*)
  bd2fa73... Merge branch 'f18' into f17 (*)
  819057c... Merge branch 'f18' into f17 (*)
  3681be5... Merge branch 'f18' into f17 (*)

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