[kdepim/f18] (16 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  d0df8ba... 4.8.4 (*)
  835c5e4... respin (*)
  e22eb67... upstream filtering patch (*)
  933ad24... 7:4.8.4-4 (*)
  e2f2df6... 4.8.5 (*)
  16e7a44... Resolves: #813257 - Ktimetracker shows only an empty window (*)
  b2cb068... filtering removes email's content (kde#295484) (*)
  1e64511... BR: prison-devel (*)
  4b639ee... Merge branch 'master' into f17 (*)
  af642aa... fix botched merge (*)
  2423b23... Merge branch 'f18' into f17 (*)
  c52834c... Merge branch 'f18' into f17 (*)
  ab3334e... Merge branch 'f18' into f17 (*)
  db2f71f... Merge branch 'f18' into f17 (*)
  d7d898e... Merge branch 'f18' into f17 (*)
  640bfb0... Merge branch 'f18' into f17 (*)

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