[libkdeedu/f18] (8 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  16985b8... 4.8.4 (*)
  1230899... 4.8.5 (*)
  41435c8... Merge branch 'master' into f17 (*)
  f9c35c4... Merge branch 'f18' into f17 (*)
  ef0017e... Merge branch 'f18' into f17 (*)
  9b325f6... Merge branch 'f18' into f17 (*)
  d4a70f5... Merge branch 'f18' into f17 (*)
  a5c51ea... Merge branch 'f18' into f17 (*)

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