[kdemultimedia/f20] (9 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  3620f98... 4.11.90 (*)
  b81a203... 4.11.95 (*)
  39cd72e... 4.11.97 (*)
  9d8e567... 4.12.0 (*)
  7bddcff... 4.12.1 (*)
  d7dd208... 4.12.2 (*)
  4dcaeeb... Revert "4.11.5"
  4c471db... Revert "4.11.4"
  142a9d5... Merge branch 'master' into f20

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