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

[Rex Dieter]

Summary of changes:

  e537980... 4.8.4 (*)
  adcfbc3... 4.8.5 (*)
  c2fd102... Merge branch 'master' into f17 (*)
  29ba7e2... Merge branch 'f18' into f17 (*)
  9b52679... Merge branch 'f18' into f17 (*)
  34d1594... Merge branch 'f18' into f17 (*)
  92f5f3c... Merge branch 'f18' into f17 (*)
  0c348ed... Merge branch 'master' into f17 (*)
  cd49ade... Merge branch 'f18' into f17 (*)

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