[kdeedu] (7 commits) ...Merge branch 'f18' into f17

Fri Mar 8 15:14:48 UTC 2013

Summary of changes:

  dca9025... 4.8.5 (*)
  094fae0... Merge branch 'master' into f17 (*)
  ddb14a8... Merge branch 'f18' into f17 (*)
  91e82ca... Merge branch 'f18' into f17 (*)
  573304d... Merge branch 'f18' into f17 (*)
  fef8176... Merge branch 'f18' into f17 (*)
  94e9b8e... Merge branch 'f18' into f17 (*)

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